From 37c68f331aef2fad40de8f2bdbe44fa1e6c743aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20=C2=BBmo=2E=C2=AB=20Sauer?= Date: Thu, 12 Mar 2015 20:43:26 +0100 Subject: [PATCH] Changed front matter "credit" to "caption" and "url" to "caption_url" This makes more sense and standardize frontmatter. --- _drafts/page_all_frontmatter.md | 4 ++-- _drafts/page_with_image.md | 4 ++-- _drafts/post_with_image.md | 2 +- _layouts/frontpage.html | 4 ++-- _layouts/page-fullwidth.html | 4 ++-- _layouts/page.html | 8 ++++---- _posts/design/2014-07-09-post-left-sidebar.md | 4 ++-- _posts/design/2014-07-10-page.md | 4 ++-- _posts/design/2014-07-10-post-right-sidebar.md | 4 ++-- _posts/design/2015-03-12-no-header-but-image.md | 8 ++++---- _posts/design/2015-11-15-comments.md | 4 ++-- _posts/design/2015-11-16-typography.md | 4 ++-- pages/documentation.md | 10 +++++----- pages/roadmap.md | 2 +- 14 files changed, 33 insertions(+), 33 deletions(-) diff --git a/_drafts/page_all_frontmatter.md b/_drafts/page_all_frontmatter.md index 2cedb77..5ddb898 100644 --- a/_drafts/page_all_frontmatter.md +++ b/_drafts/page_all_frontmatter.md @@ -23,8 +23,8 @@ image: title: homepage: thumb: - credit: - url: + caption: + caption_url: show_meta: false sidebar: left comments: true diff --git a/_drafts/page_with_image.md b/_drafts/page_with_image.md index 070e1dd..67cfc42 100644 --- a/_drafts/page_with_image.md +++ b/_drafts/page_with_image.md @@ -13,8 +13,8 @@ image: title: thumb: homepage: - credit: - url: + caption: + caption_url: --- diff --git a/_drafts/post_with_image.md b/_drafts/post_with_image.md index a9b0ee4..a9b2d2d 100644 --- a/_drafts/post_with_image.md +++ b/_drafts/post_with_image.md @@ -12,7 +12,7 @@ image: header: "" thumb: "" homepage: "" - credit: "" + caption: "" url: "" --- diff --git a/_layouts/frontpage.html b/_layouts/frontpage.html index 89b5368..1b2db78 100644 --- a/_layouts/frontpage.html +++ b/_layouts/frontpage.html @@ -62,9 +62,9 @@ format: blog-index {{ page.title escape_once }}

- {% if post.image.url && post.image.credit %} + {% if post.image.caption_url && post.image.caption %}

- {{ post.image.credit }} + {{ post.image.caption }}

{% endif %} {% elsif post.image.homepage == NULL %} diff --git a/_layouts/page-fullwidth.html b/_layouts/page-fullwidth.html index 8234023..378a000 100644 --- a/_layouts/page-fullwidth.html +++ b/_layouts/page-fullwidth.html @@ -6,9 +6,9 @@ format: page-fullwidth
{{ page.title escape_once }} - {% if page.image.url && page.image.credit %} + {% if page.image.caption_url && page.image.caption %}

- {{ page.image.credit }} + {{ page.image.caption }}

{% endif %}
diff --git a/_layouts/page.html b/_layouts/page.html index 7758265..d1df87b 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -10,13 +10,13 @@ format: post
{{ page.title escape_once }} - {% if page.image.url && page.image.credit %} + {% if page.image.caption_url && page.image.caption %}
- {{ page.image.credit }} + {{ page.image.caption }}
- {% elsif page.image.credit %} + {% elsif page.image.caption %}
- {{ page.image.credit }} + {{ page.image.caption }}
{% endif %}
diff --git a/_posts/design/2014-07-09-post-left-sidebar.md b/_posts/design/2014-07-09-post-left-sidebar.md index 38ca5f4..da3668c 100755 --- a/_posts/design/2014-07-09-post-left-sidebar.md +++ b/_posts/design/2014-07-09-post-left-sidebar.md @@ -11,8 +11,8 @@ categories: - design image: title: "unsplash_1.jpg" - credit: Unsplash.com - url: http://unsplash.com + caption: Unsplash.com + caption_url: http://unsplash.com --- *Feeling Responsive* shows metadata by default. The default behaviour can be changed via `config.yml`. To show metadata at the end of a page/post just add the following to front matter: diff --git a/_posts/design/2014-07-10-page.md b/_posts/design/2014-07-10-page.md index fbefa42..264f554 100755 --- a/_posts/design/2014-07-10-page.md +++ b/_posts/design/2014-07-10-page.md @@ -14,8 +14,8 @@ tags: - post format image: title: "unsplash_1.jpg" - credit: Unsplash.com - url: http://unsplash.com + caption: Unsplash.com + caption_url: http://unsplash.com author: mo --- *Feeling Responsive* shows metadata by default. The default behaviour can be changed via `config.yml`. To show metadata at the end of a page/post just add the following to front matter: diff --git a/_posts/design/2014-07-10-post-right-sidebar.md b/_posts/design/2014-07-10-post-right-sidebar.md index 9739a9c..8086238 100755 --- a/_posts/design/2014-07-10-post-right-sidebar.md +++ b/_posts/design/2014-07-10-post-right-sidebar.md @@ -12,8 +12,8 @@ categories: image: thumb: "unsplash_2_thumb.jpg" title: "unsplash_2.jpg" - credit: Unsplash.com - url: http://unsplash.com + caption: Unsplash.com + caption_url: http://unsplash.com --- *Feeling Responsive* shows metadata by default. The default behaviour can be changed via `config.yml`. To show metadata at the end of a page/post just add the following to front matter: diff --git a/_posts/design/2015-03-12-no-header-but-image.md b/_posts/design/2015-03-12-no-header-but-image.md index 65d93ff..f3e717c 100644 --- a/_posts/design/2015-03-12-no-header-but-image.md +++ b/_posts/design/2015-03-12-no-header-but-image.md @@ -12,8 +12,8 @@ tags: header: no image: title: unsplash_eagle.jpg - credit: This is a caption for the header image with link - url: https://unsplash.com/ + caption: This is a caption for the header image with link + caption_url: https://unsplash.com/ --- First turn of the header with `header: no`. Than add an image to with the following code. The caption is optional. @@ -21,8 +21,8 @@ First turn of the header with `header: no`. Than add an image to with the follow header: no image: title: unsplash_eagle.jpg - credit: This is a caption for the header image with link - url: https://unsplash.com/ + caption: This is a caption for the header image with link + caption_url: https://unsplash.com/ ~~~ diff --git a/_posts/design/2015-11-15-comments.md b/_posts/design/2015-11-15-comments.md index 0bc91f3..cd51d9d 100644 --- a/_posts/design/2015-11-15-comments.md +++ b/_posts/design/2015-11-15-comments.md @@ -5,8 +5,8 @@ title: "Now with Comments!" teaser: "For a blog you need comments. Like all those other jekyll themes we baked in Disqus. It's easy to set, it works and makes a static jekyll blog more dynamic." header: image_fullwidth: "header_typewriter.jpg" - credit: Image by Florian Klauer - url: "http://florianklauer.de/" + caption: Image by Florian Klauer + caption_url: "http://florianklauer.de/" image: thumb: typewriter_thumb.jpg homepage: homepage_typewriter.jpg diff --git a/_posts/design/2015-11-16-typography.md b/_posts/design/2015-11-16-typography.md index 27b18b4..c7d400a 100755 --- a/_posts/design/2015-11-16-typography.md +++ b/_posts/design/2015-11-16-typography.md @@ -8,8 +8,8 @@ header: no image: thumb: homepage_typography_thumb.jpg homepage: homepage_typography.jpg - credit: Image by Antonio - url: "http://www.aisleone.net/" + caption: Image by Antonio + caption_url: "http://www.aisleone.net/" categories: - design --- diff --git a/pages/documentation.md b/pages/documentation.md index d369681..03c1d2a 100644 --- a/pages/documentation.md +++ b/pages/documentation.md @@ -150,15 +150,15 @@ image: -### Credits with URL +### Captions with URL Sometimes you want to give credit to the creator of your images, maybe with a link. Especially when you use Creative Commons-images like I do for this website. Just add the following front matter and *Feeling Responsive* does the rest: ~~~ image: title: header_image.jpg - credit: Image by Phlow - url: "http://phlow.de/" + caption: Image by Phlow + caption_url: "http://phlow.de/" ~~~ ### Define all images for an article @@ -168,8 +168,8 @@ image: title: title_image.jpg thumb: thumbnail_image.jpg homepage: header_homepage_13.jpg - credit: Image by Phlow - url: "http://phlow.de/" + caption: Image by Phlow + caption_url: "http://phlow.de/" ~~~ diff --git a/pages/roadmap.md b/pages/roadmap.md index 54922c5..2ff6f6d 100644 --- a/pages/roadmap.md +++ b/pages/roadmap.md @@ -43,7 +43,7 @@ permalink: "/roadmap/" * [Add draft-templates for new pages/posts](https://github.com/Phlow/feeling-responsive/tree/gh-pages/_drafts) * [Step-by-Step-Guide to customize *Feeling Responsive*]({{ site.url }}/getting-started/) * [Video-Post-Format to feature videos in a huge way]({{ site.url }}/design/video/) -* Title and Credit for images +* Title and captions for images * SEO › Add metadescription to header.html and front matter * [Adding Open Graph for Jekyll](https://gist.github.com/pathawks/1406355) * [Gallery Post Example]({{ site.url }}/design/gallery/)