From 16fe2bab9865a585bad91213ce4e9a44bb437853 Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Mon, 11 Apr 2016 14:55:14 -0700 Subject: [PATCH 1/5] utilizing Template Inheritance for Templates --- dist/_patterns/03-templates/00-homepage.twig | 40 -------------------- dist/_patterns/03-templates/00-site.twig | 9 +++++ dist/_patterns/03-templates/01-blog.twig | 17 --------- dist/_patterns/03-templates/01-homepage.twig | 37 ++++++++++++++++++ dist/_patterns/03-templates/02-article.twig | 24 ------------ dist/_patterns/03-templates/02-blog.twig | 14 +++++++ dist/_patterns/03-templates/03-article.twig | 21 ++++++++++ 7 files changed, 81 insertions(+), 81 deletions(-) delete mode 100644 dist/_patterns/03-templates/00-homepage.twig create mode 100644 dist/_patterns/03-templates/00-site.twig delete mode 100644 dist/_patterns/03-templates/01-blog.twig create mode 100644 dist/_patterns/03-templates/01-homepage.twig delete mode 100644 dist/_patterns/03-templates/02-article.twig create mode 100644 dist/_patterns/03-templates/02-blog.twig create mode 100644 dist/_patterns/03-templates/03-article.twig diff --git a/dist/_patterns/03-templates/00-homepage.twig b/dist/_patterns/03-templates/00-homepage.twig deleted file mode 100644 index d30463c..0000000 --- a/dist/_patterns/03-templates/00-homepage.twig +++ /dev/null @@ -1,40 +0,0 @@ -
- {% include "organisms-header" %} -
- {% if emergency %} - {% include "molecules-alert:error" %} - {% endif %} - {% if hero %} - {% include "molecules-block-hero" %} - {% endif %} - -
- {% for tout in touts %} -
- {% include "molecules-block-inset" %} -
- {% endfor %} -
- -
- -
-
-
-

Latest Posts

-
    - {% for post in latest_posts %} -
  • {% include "molecules-media-block" %}
    • - {% endfor %} -
- View more posts -
-
- -
- {% include "organisms-recent-tweets" %} -
-
-
- {% include "organisms-footer" %} -
\ No newline at end of file diff --git a/dist/_patterns/03-templates/00-site.twig b/dist/_patterns/03-templates/00-site.twig new file mode 100644 index 0000000..55436fe --- /dev/null +++ b/dist/_patterns/03-templates/00-site.twig @@ -0,0 +1,9 @@ +
+ {% include "organisms-header" %} +
+ {% block content %} +

Content Placeholder

+ {% endblock %} +
+ {% include "organisms-footer" %} +
\ No newline at end of file diff --git a/dist/_patterns/03-templates/01-blog.twig b/dist/_patterns/03-templates/01-blog.twig deleted file mode 100644 index 43b26f2..0000000 --- a/dist/_patterns/03-templates/01-blog.twig +++ /dev/null @@ -1,17 +0,0 @@ -
- {% include "organisms-header" %} -
-

Our Outdoor Blog

-
-
- {% include "organisms-latest-posts" %} - {% include "molecules-pagination" %} -
- -
- {% include "organisms-recent-tweets" %} -
-
-
- {% include "organisms-footer" %} -
\ No newline at end of file diff --git a/dist/_patterns/03-templates/01-homepage.twig b/dist/_patterns/03-templates/01-homepage.twig new file mode 100644 index 0000000..df149ea --- /dev/null +++ b/dist/_patterns/03-templates/01-homepage.twig @@ -0,0 +1,37 @@ +{% extends "templates-site" %} +{% block content %} + {% if emergency %} + {% include "molecules-alert:error" %} + {% endif %} + {% if hero %} + {% include "molecules-block-hero" %} + {% endif %} + +
+ {% for tout in touts %} +
+ {% include "molecules-block-inset" %} +
+ {% endfor %} +
+ +
+ +
+
+
+

Latest Posts

+
    + {% for post in latest_posts %} +
  • {% include "molecules-media-block" %}
    • + {% endfor %} +
+ View more posts +
+
+ +
+ {% include "organisms-recent-tweets" %} +
+
+{% endblock %} \ No newline at end of file diff --git a/dist/_patterns/03-templates/02-article.twig b/dist/_patterns/03-templates/02-article.twig deleted file mode 100644 index 8ccc399..0000000 --- a/dist/_patterns/03-templates/02-article.twig +++ /dev/null @@ -1,24 +0,0 @@ -
- {% include "organisms-header" %} -
-
-
-
-
-

Article Headline Lorem ipsum dolor sit aweofij

- {% include "molecules-byline" %} -
- {% include "organisms-article-body" %} -
- {% include "molecules-social-share" %} - {% include "organisms-comment-thread" %} -
- -
- {% include "organisms-related-posts" %} - {% include "organisms-recent-tweets" %} -
-
-
- {% include "organisms-footer" %} -
\ No newline at end of file diff --git a/dist/_patterns/03-templates/02-blog.twig b/dist/_patterns/03-templates/02-blog.twig new file mode 100644 index 0000000..6b8f6c4 --- /dev/null +++ b/dist/_patterns/03-templates/02-blog.twig @@ -0,0 +1,14 @@ +{% extends "templates-site" %} +{% block content %} +

Our Outdoor Blog

+
+
+ {% include "organisms-latest-posts" %} + {% include "molecules-pagination" %} +
+ +
+ {% include "organisms-recent-tweets" %} +
+
+{% endblock %} \ No newline at end of file diff --git a/dist/_patterns/03-templates/03-article.twig b/dist/_patterns/03-templates/03-article.twig new file mode 100644 index 0000000..55268b9 --- /dev/null +++ b/dist/_patterns/03-templates/03-article.twig @@ -0,0 +1,21 @@ +{% extends "templates-site" %} +{% block content %} +
+
+
+
+

Article Headline Lorem ipsum dolor sit aweofij

+ {% include "molecules-byline" %} +
+ {% include "organisms-article-body" %} +
+ {% include "molecules-social-share" %} + {% include "organisms-comment-thread" %} +
+ +
+ {% include "organisms-related-posts" %} + {% include "organisms-recent-tweets" %} +
+
+{% endblock %} \ No newline at end of file From fc538199c4392288af907e9d5b9ce390327fa7b3 Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Mon, 11 Apr 2016 16:08:47 -0700 Subject: [PATCH 2/5] setting up homepage emergency demo --- dist/_patterns/03-templates/01-homepage.twig | 6 +++--- dist/_patterns/04-pages/00-homepage~emergency.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/_patterns/03-templates/01-homepage.twig b/dist/_patterns/03-templates/01-homepage.twig index df149ea..7a77580 100644 --- a/dist/_patterns/03-templates/01-homepage.twig +++ b/dist/_patterns/03-templates/01-homepage.twig @@ -1,7 +1,7 @@ {% extends "templates-site" %} {% block content %} {% if emergency %} - {% include "molecules-alert:error" %} + {% include "molecules-alert" with emergency %} {% endif %} {% if hero %} {% include "molecules-block-hero" %} @@ -16,7 +16,7 @@
- +
@@ -34,4 +34,4 @@ {% include "organisms-recent-tweets" %}
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/dist/_patterns/04-pages/00-homepage~emergency.json b/dist/_patterns/04-pages/00-homepage~emergency.json index 2167094..1425506 100644 --- a/dist/_patterns/04-pages/00-homepage~emergency.json +++ b/dist/_patterns/04-pages/00-homepage~emergency.json @@ -1,6 +1,6 @@ { "emergency": { - "alertClass" : "error", + "styleModifier" : "error", "excerpt" : { "short" : "Emergency! This is a variation of the core homepage template." } From e350a71f602fec8cf1e6fad7bb396bcdc8366aeb Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Mon, 11 Apr 2016 16:34:06 -0700 Subject: [PATCH 3/5] improving template and layout inheritance --- .../03-templates/00-layouts/00-site.twig | 9 +++++ .../03-templates/00-layouts/01-page-1col.twig | 10 ++++++ .../03-templates/00-layouts/01-page-2col.twig | 15 ++++++++ dist/_patterns/03-templates/00-site.twig | 9 ----- dist/_patterns/03-templates/01-homepage.twig | 36 +++++++++---------- dist/_patterns/03-templates/02-blog.twig | 19 +++++----- dist/_patterns/03-templates/03-article.twig | 36 +++++++++---------- dist/_patterns/03-templates/03-article2.twig | 12 +++++++ 8 files changed, 87 insertions(+), 59 deletions(-) create mode 100644 dist/_patterns/03-templates/00-layouts/00-site.twig create mode 100644 dist/_patterns/03-templates/00-layouts/01-page-1col.twig create mode 100644 dist/_patterns/03-templates/00-layouts/01-page-2col.twig delete mode 100644 dist/_patterns/03-templates/00-site.twig create mode 100644 dist/_patterns/03-templates/03-article2.twig diff --git a/dist/_patterns/03-templates/00-layouts/00-site.twig b/dist/_patterns/03-templates/00-layouts/00-site.twig new file mode 100644 index 0000000..336ecf0 --- /dev/null +++ b/dist/_patterns/03-templates/00-layouts/00-site.twig @@ -0,0 +1,9 @@ +
+ {% include "organisms-header" %} +
+ {% block hero %}{% endblock %} + {% block title %}{% endblock %} + {% block content %}{% endblock %} +
+ {% include "organisms-footer" %} +
\ No newline at end of file diff --git a/dist/_patterns/03-templates/00-layouts/01-page-1col.twig b/dist/_patterns/03-templates/00-layouts/01-page-1col.twig new file mode 100644 index 0000000..98059a2 --- /dev/null +++ b/dist/_patterns/03-templates/00-layouts/01-page-1col.twig @@ -0,0 +1,10 @@ +{% extends "templates-site" %} +{% block content %} +
+
+ {% block main %} +

Content Placeholder

+ {% endblock %} +
+
+{% endblock %} \ No newline at end of file diff --git a/dist/_patterns/03-templates/00-layouts/01-page-2col.twig b/dist/_patterns/03-templates/00-layouts/01-page-2col.twig new file mode 100644 index 0000000..b9dbafc --- /dev/null +++ b/dist/_patterns/03-templates/00-layouts/01-page-2col.twig @@ -0,0 +1,15 @@ +{% extends "templates-site" %} +{% block content %} +
+
+ {% block main %} +

Content Placeholder

+ {% endblock %} +
+
+ {% block sidebar %} +

Sidebar

+ {% endblock %} +
+
+{% endblock %} \ No newline at end of file diff --git a/dist/_patterns/03-templates/00-site.twig b/dist/_patterns/03-templates/00-site.twig deleted file mode 100644 index 55436fe..0000000 --- a/dist/_patterns/03-templates/00-site.twig +++ /dev/null @@ -1,9 +0,0 @@ -
- {% include "organisms-header" %} -
- {% block content %} -

Content Placeholder

- {% endblock %} -
- {% include "organisms-footer" %} -
\ No newline at end of file diff --git a/dist/_patterns/03-templates/01-homepage.twig b/dist/_patterns/03-templates/01-homepage.twig index 7a77580..bec9a31 100644 --- a/dist/_patterns/03-templates/01-homepage.twig +++ b/dist/_patterns/03-templates/01-homepage.twig @@ -1,5 +1,5 @@ -{% extends "templates-site" %} -{% block content %} +{% extends "templates-page-2col" %} +{% block hero %} {% if emergency %} {% include "molecules-alert" with emergency %} {% endif %} @@ -16,22 +16,20 @@
- -
-
-
-

Latest Posts

-
    - {% for post in latest_posts %} -
  • {% include "molecules-media-block" %}
    • - {% endfor %} -
- View more posts -
-
+{% endblock %} + +{% block main %} +
+

Latest Posts

+
    + {% for post in latest_posts %} +
  • {% include "molecules-media-block" %}
    • + {% endfor %} +
+ View more posts +
+{% endblock %} -
- {% include "organisms-recent-tweets" %} -
-
+{% block sidebar %} + {% include "organisms-recent-tweets" %} {% endblock %} diff --git a/dist/_patterns/03-templates/02-blog.twig b/dist/_patterns/03-templates/02-blog.twig index 6b8f6c4..6c2b7e2 100644 --- a/dist/_patterns/03-templates/02-blog.twig +++ b/dist/_patterns/03-templates/02-blog.twig @@ -1,14 +1,11 @@ {% extends "templates-site" %} -{% block content %} -

Our Outdoor Blog

-
-
- {% include "organisms-latest-posts" %} - {% include "molecules-pagination" %} -
+{% block title %}

Our Outdoor Blog

{% endblock %} -
- {% include "organisms-recent-tweets" %} -
-
+{% block main %} + {% include "organisms-latest-posts" %} + {% include "molecules-pagination" %} +{% endblock %} + +{% block sidebar %} + {% include "organisms-recent-tweets" %} {% endblock %} \ No newline at end of file diff --git a/dist/_patterns/03-templates/03-article.twig b/dist/_patterns/03-templates/03-article.twig index 55268b9..b5a217f 100644 --- a/dist/_patterns/03-templates/03-article.twig +++ b/dist/_patterns/03-templates/03-article.twig @@ -1,21 +1,17 @@ -{% extends "templates-site" %} -{% block content %} -
-
-
-
-

Article Headline Lorem ipsum dolor sit aweofij

- {% include "molecules-byline" %} -
- {% include "organisms-article-body" %} -
- {% include "molecules-social-share" %} - {% include "organisms-comment-thread" %} -
+{% extends "templates-page-2col" %} +{% block main %} +
+
+

Article Headline Lorem ipsum dolor sit aweofij

+ {% include "molecules-byline" %} +
+ {% include "organisms-article-body" %} +
+ {% include "molecules-social-share" %} + {% include "organisms-comment-thread" %} +{% endblock %} -
- {% include "organisms-related-posts" %} - {% include "organisms-recent-tweets" %} -
-
-{% endblock %} \ No newline at end of file +{% block sidebar %} + {% include "organisms-related-posts" %} + {% include "organisms-recent-tweets" %} +{% endblock %} diff --git a/dist/_patterns/03-templates/03-article2.twig b/dist/_patterns/03-templates/03-article2.twig new file mode 100644 index 0000000..1d6ce0f --- /dev/null +++ b/dist/_patterns/03-templates/03-article2.twig @@ -0,0 +1,12 @@ +{% extends "templates-page-1col" %} +{% block main %} +
+
+

Article Headline Lorem ipsum dolor sit aweofij

+ {% include "molecules-byline" %} +
+ {% include "organisms-article-body" %} +
+ {% include "molecules-social-share" %} + {% include "organisms-comment-thread" %} +{% endblock %} From d80e429de46d63df9ecc2aaf749039982f15c04e Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Mon, 11 Apr 2016 16:53:59 -0700 Subject: [PATCH 4/5] adding form input macro --- dist/_macros/forms.twig | 21 ++++++++ .../00-atoms/05-forms/00-text-fields.twig | 49 +++++-------------- 2 files changed, 33 insertions(+), 37 deletions(-) create mode 100644 dist/_macros/forms.twig diff --git a/dist/_macros/forms.twig b/dist/_macros/forms.twig new file mode 100644 index 0000000..e860bb3 --- /dev/null +++ b/dist/_macros/forms.twig @@ -0,0 +1,21 @@ +{% macro input(name, type, classes, label, placeholder, value, size, required) %} + {% set show_label = label|default(true) %} +
+ {% if show_label %} + {% endif %} +
+{% endmacro %} + +{% macro textarea(label, placeholder, rows, classes) %} + {% set show_label = label|default(true) %} +
+ {% if show_label %} + {% endif %} +
+{% endmacro %} diff --git a/dist/_patterns/00-atoms/05-forms/00-text-fields.twig b/dist/_patterns/00-atoms/05-forms/00-text-fields.twig index 90cbb77..f09b3a9 100644 --- a/dist/_patterns/00-atoms/05-forms/00-text-fields.twig +++ b/dist/_patterns/00-atoms/05-forms/00-text-fields.twig @@ -1,38 +1,13 @@ +{% import "forms.twig" as forms %}
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
\ No newline at end of file + {{ forms.input('Text Input') }} + {{ forms.input('Password', 'password') }} + {{ forms.input('Web Address', 'url') }} + {{ forms.input('Email', 'email') }} + {{ forms.input('Search', 'search') }} + {{ forms.input('Number', 'number') }} + {{ forms.input('Number', 'number') }} + {{ forms.textarea('Textarea', 'Enter your message here') }} + {{ forms.input('Error Input', 'text', 'error') }} + {{ forms.input('Valid Input', 'text', 'valid') }} + From 3e753ff02685b6a66785d3c0264e7c586896f09a Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Mon, 11 Apr 2016 17:07:49 -0700 Subject: [PATCH 5/5] renaming 2 col article --- .../03-templates/{03-article2.twig => 03-article-2col.twig} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dist/_patterns/03-templates/{03-article2.twig => 03-article-2col.twig} (100%) diff --git a/dist/_patterns/03-templates/03-article2.twig b/dist/_patterns/03-templates/03-article-2col.twig similarity index 100% rename from dist/_patterns/03-templates/03-article2.twig rename to dist/_patterns/03-templates/03-article-2col.twig