diff --git a/_config.yml b/_config.yml index 75a4381..faeac26 100644 --- a/_config.yml +++ b/_config.yml @@ -55,7 +55,7 @@ url: 'https://www.xaymar.com' # the base hostname & protocol for your site, e.g. permalink: '/articles/:year/:month/:day/:slug/' # Themeing -#ignore_theme_config: true +ignore_theme_config: true #theme: null collections: @@ -123,6 +123,19 @@ xaymar: identifier: 'xaymars-blog' url: 'https://www.xaymar.com:pageurl' + +############################################################ +# Jekyll-feed +feed: + posts_limit: 100 + excerpt_only: true + categories: + - "Blog" + - "News" + - "Reviews" + tags: + path: "/feed/tag/" + ############################################################ # Site configuration for the Jekyll 3 Pagination Gem # The values here represent the defaults if nothing is set @@ -215,7 +228,7 @@ autopages: # Tag pages, omit to disable tags: layouts: - - 'index.liquid' + - 'index_tags.liquid' title: 'Tag: :tag' # :tag is replaced by the tag name permalink: '/tag/:tag' silent: false diff --git a/_includes/page_start.liquid b/_includes/page_start.liquid index 3dd8071..4a94093 100644 --- a/_includes/page_start.liquid +++ b/_includes/page_start.liquid @@ -1,7 +1,6 @@ - {% comment %} {% assign csp="default-src *; script-src 'self'" %} @@ -14,11 +13,10 @@ {% endcomment %} -{% if page.title == nil %} - {{ site.title }} - {{ site.tagline }} -{% else %} - {{ page.title }} | {{ site.title }} - {{ site.tagline }} -{% endif %} + +{% comment %} +Support for OpenGraph +{% endcomment %} {% if page.url != nil %} {% else %} @@ -44,8 +42,12 @@ {% endif %} +{% if page.title == nil %} + {{ site.title }} - {{ site.tagline }} +{% else %} + {{ page.title }} | {{ site.title }} - {{ site.tagline }} +{% endif %} - - + diff --git a/_layouts/default.liquid b/_layouts/default.liquid index fb19260..57108e2 100644 --- a/_layouts/default.liquid +++ b/_layouts/default.liquid @@ -1,4 +1,10 @@ {% include page_start.liquid %} +{% for data in page.categories %} + +{% endfor %} +{% for data in page.tags %} + +{% endfor %} {% include page_content.liquid %} {% include breadcrumbs.liquid title=page.title permalink=page.url %} {% include article.liquid type=post title=page.title content=page.content timestamp=page.date permalink=page.url tags=page.tags %} diff --git a/_layouts/index_tags.liquid b/_layouts/index_tags.liquid new file mode 100644 index 0000000..9ef8d43 --- /dev/null +++ b/_layouts/index_tags.liquid @@ -0,0 +1,29 @@ +{% include page_start.liquid %} + +{% include page_content.liquid %} +{% include breadcrumbs.liquid title=page.title permalink=page.url %} +
+{% for data in paginator.posts %} + {% if site.xaymar.index.excerpt.enabled %} + {% assign content=data.excerpt | strip_html | normalize_whitespace | truncatewords: site.xaymar.index.excerpt.length %} + {% else %} + {% assign content=data.content %} + {% endif %} + {% include article.liquid type=post index=true title=data.title content=content permalink=data.url categories=data.categories tags=data.tags timestamp=data.date %} +{% endfor %} +
+{% if paginator.total_pages > 1 %} + +{% endif %} +{% include page_end.liquid %}