diff --git a/layout/_layout.swig b/layout/_layout.swig index 2881909270..26e03e0044 100644 --- a/layout/_layout.swig +++ b/layout/_layout.swig @@ -1,26 +1,26 @@ {# NexT version #} -{% set version = next_env('version') %} +{%- set version = next_env('version') %} {# Language & Config #} -{% set title = __('title') !== 'title' && __('title') || config.title %} -{% set subtitle = __('subtitle') !== 'subtitle' && __('subtitle') || config.subtitle %} -{% set author = __('author') !== 'author' && __('author') || config.author %} -{% set description = __('description') !== 'description' && __('description') || config.description %} +{%- set title = __('title') !== 'title' && __('title') || config.title %} +{%- set subtitle = __('subtitle') !== 'subtitle' && __('subtitle') || config.subtitle %} +{%- set author = __('author') !== 'author' && __('author') || config.author %} +{%- set description = __('description') !== 'description' && __('description') || config.description %} -{% set html_class = 'theme-next ' + theme.scheme %} -{% if theme.motion.enable %} - {% set html_class = html_class + ' use-motion' %} -{% endif %} +{%- set html_class = 'theme-next ' + theme.scheme %} +{%- if theme.motion.enable %} + {%- set html_class = html_class + ' use-motion' %} +{%- endif %} {{ partial('_partials/head/head.swig', {}, {cache: theme.cache.enable}) }} {% include '_partials/head/head-unique.swig' %} - {% for inject_item in theme.injects.head %} + {%- for inject_item in theme.injects.head %} {{ partial(inject_item.layout, inject_item.locals, inject_item.options) }} - {% endfor %} + {%- endfor %} {% block title %}{% endblock %} {% include '_third-party/analytics/index.swig' %} {{ partial('_scripts/noscript.swig', {}, {cache: theme.cache.enable}) }} @@ -28,10 +28,10 @@ - {% set container_class = 'container' %} - {% if theme.sidebar.position %} - {% set container_class = container_class + ' sidebar-position-' + theme.sidebar.position %} - {% endif %} + {%- set container_class = 'container' %} + {%- if theme.sidebar.position %} + {%- set container_class = container_class + ' sidebar-position-' + theme.sidebar.position %} + {%- endif %}
@@ -45,17 +45,17 @@
- {% if theme.scheme === 'Pisces' || theme.scheme === 'Gemini' %} + {%- if theme.scheme === 'Pisces' || theme.scheme === 'Gemini' %} {% include '_partials/header/sub-menu.swig' %} - {% endif %} + {%- endif %}
{% block content %}{% endblock %}
{% include '_partials/comments.swig' %}
- {% if theme.sidebar.display !== 'remove' %} + {%- if theme.sidebar.display !== 'remove' %} {% block sidebar %}{% endblock %} - {% endif %} + {%- endif %}
@@ -67,14 +67,14 @@
- {% if theme.back2top.enable and not theme.back2top.sidebar %} + {%- if theme.back2top.enable and not theme.back2top.sidebar %}
- {% if theme.back2top.scrollpercent %} + {%- if theme.back2top.scrollpercent %} 0% - {% endif %} + {%- endif %}
- {% endif %} + {%- endif %} {% include '_partials/share/index.swig' %} @@ -82,7 +82,7 @@ {% include '_scripts/vendors.swig' %} {% include '_scripts/commons.swig' %} - {% set scheme_script = '_scripts/schemes/' + theme.scheme | lower + '.swig' %} + {%- set scheme_script = '_scripts/schemes/' + theme.scheme | lower + '.swig' %} {% include scheme_script %} {% block script_extra %}{% endblock %} @@ -94,9 +94,9 @@ {% include '_third-party/index.swig' %} - {% for inject_item in theme.injects.bodyEnd %} + {%- for inject_item in theme.injects.bodyEnd %} {{ partial(inject_item.layout, inject_item.locals, inject_item.options) }} - {% endfor %} + {%- endfor %} diff --git a/layout/_macro/menu/menu-badge.swig b/layout/_macro/menu/menu-badge.swig index b2dcce135d..bb44a31a6e 100644 --- a/layout/_macro/menu/menu-badge.swig +++ b/layout/_macro/menu/menu-badge.swig @@ -1,14 +1,14 @@ {% macro render(name) %} - {% set badges = { + {%- set badges = { archives: site.posts.length, categories: site.categories.length, tags: site.tags.length } %} - {% for menu, count in badges %} - {% if name == menu %} + {%- for menu, count in badges %} + {%- if name == menu %} {{ count }} - {% endif %} - {% endfor %} + {%- endif %} + {%- endfor %} {% endmacro %} diff --git a/layout/_macro/menu/menu-item.swig b/layout/_macro/menu/menu-item.swig index 0dca585233..734f1f5efe 100644 --- a/layout/_macro/menu/menu-item.swig +++ b/layout/_macro/menu/menu-item.swig @@ -1,20 +1,20 @@ {% macro render(name, value) %} {% import 'menu-badge.swig' as menu_badge %} - {% set itemURL = value.split('||')[0] | trim %} - {% if itemURL.indexOf('http') != 0 %} - {% set itemURL = itemURL | replace('//', '/', 'g') %} - {% endif %} + {%- set itemURL = value.split('||')[0] | trim %} + {%- if itemURL.indexOf('http') != 0 %} + {%- set itemURL = itemURL | replace('//', '/', 'g') %} + {%- endif %}
  • - {% set menuText = __('menu.' + name) | replace('menu.', '') %} - {% if theme.menu_settings.icons %} - {% set menuIcon = '
    ' %} - {% endif %} + {%- set menuText = __('menu.' + name) | replace('menu.', '') %} + {%- if theme.menu_settings.icons %} + {%- set menuIcon = '
    ' %} + {%- endif %} - {% if theme.menu_settings.badges %} - {% set menuBadge = menu_badge.render(name) | trim %} - {% endif %} + {%- if theme.menu_settings.badges %} + {%- set menuBadge = menu_badge.render(name) | trim %} + {%- endif %} {{ next_url(itemURL, menuIcon + menuText + menuBadge, {rel: 'section'}) }} diff --git a/layout/_macro/post-collapse.swig b/layout/_macro/post-collapse.swig index 528edee7c7..a3eb3b5c97 100644 --- a/layout/_macro/post-collapse.swig +++ b/layout/_macro/post-collapse.swig @@ -3,21 +3,21 @@
    - <{% if theme.seo %}h3{% else %}h2{% endif %} class="post-title"> - {% if post.link %}{# Link posts #} - {% set postTitleIcon = '' %} - {% set postText = post.title or post.link %} + <{%- if theme.seo %}h3{% else %}h2{%- endif %} class="post-title"> + {%- if post.link %}{# Link posts #} + {%- set postTitleIcon = '' %} + {%- set postText = post.title or post.link %} {{ next_url(post.link, postText + postTitleIcon, {class: 'post-title-link post-title-link-external', itemprop: 'url' }) }} {% else %} - {% endif %} - + {%- endif %} +
    - {% if theme.related_posts.enable and (theme.related_posts.display_in_home or not is_index) %} + {%- if theme.related_posts.enable and (theme.related_posts.display_in_home or not is_index) %} {% include '../_partials/post/post-related.swig' with { post: post } %} - {% endif %} + {%- endif %} - {% if not is_index %} - {% for inject_item in theme.injects.postBodyEnd %} + {%- if not is_index %} + {%- for inject_item in theme.injects.postBodyEnd %} {{ partial(inject_item.layout, inject_item.locals, inject_item.options) }} - {% endfor %} - {% endif %} + {%- endfor %} + {%- endif %} {#####################} {### END POST BODY ###} {#####################} - {% if theme.wechat_subscriber.enable and not is_index %} + {%- if theme.wechat_subscriber.enable and not is_index %} {% include '../_partials/post/wechat-subscriber.swig' %} - {% endif %} + {%- endif %} - {% if page.reward === undefined and theme.reward_settings.enable %} - {% set reward_able = true %} + {%- if page.reward === undefined and theme.reward_settings.enable %} + {%- set reward_able = true %} {% else %} - {% set reward_able = page.reward %} - {% endif %} - {% if reward_able and not is_index %} + {%- set reward_able = page.reward %} + {%- endif %} + {%- if reward_able and not is_index %}
    {% include '../_partials/post/reward.swig' %}
    - {% endif %} + {%- endif %} - {% if theme.creative_commons.license and theme.creative_commons.post and not is_index %} + {%- if theme.creative_commons.license and theme.creative_commons.post and not is_index %}
    {% include '../_partials/post/post-copyright.swig' with { post: post } %}
    - {% endif %} + {%- endif %}
    - {% if post.tags and post.tags.length and not is_index %} - {% if theme.tag_icon %} - {% set tag_indicate = '' %} + {%- if post.tags and post.tags.length and not is_index %} + {%- if theme.tag_icon %} + {%- set tag_indicate = '' %} {% else %} - {% set tag_indicate = '#' %} - {% endif %} + {%- set tag_indicate = '#' %} + {%- endif %}
    - {% for tag in post.tags %} + {%- for tag in post.tags %} - {% endfor %} + {%- endfor %}
    - {% endif %} + {%- endif %} - {% if not is_index %} - {% if theme.rating.enable or (theme.vkontakte_api.enable and theme.vkontakte_api.like) or (theme.facebook_sdk.enable and theme.facebook_sdk.like_button) or theme.likely.enable or (theme.needmoreshare2.enable and theme.needmoreshare2.postbottom.enable) %} + {%- if not is_index %} + {%- if theme.rating.enable or (theme.vkontakte_api.enable and theme.vkontakte_api.like) or (theme.facebook_sdk.enable and theme.facebook_sdk.like_button) or theme.likely.enable or (theme.needmoreshare2.enable and theme.needmoreshare2.postbottom.enable) %}
    - {% if theme.rating.enable %} + {%- if theme.rating.enable %}
    - {% endif %} + {%- endif %} - {% if (theme.vkontakte_api.enable and theme.vkontakte_api.like) or (theme.facebook_sdk.enable and theme.facebook_sdk.like_button) %} + {%- if (theme.vkontakte_api.enable and theme.vkontakte_api.like) or (theme.facebook_sdk.enable and theme.facebook_sdk.like_button) %} - {% endif %} + {%- endif %} - {% if theme.likely.enable or (theme.needmoreshare2.enable and theme.needmoreshare2.postbottom.enable) %} + {%- if theme.likely.enable or (theme.needmoreshare2.enable and theme.needmoreshare2.postbottom.enable) %} - {% endif %} + {%- endif %}
    - {% endif %} - {% endif %} + {%- endif %} + {%- endif %} - {% if not is_index and (post.prev or post.next) %} + {%- if not is_index and (post.prev or post.next) %}
    - {% if post.next %} + {%- if post.next %} - {% endif %} + {%- endif %}
    - {% if post.prev %} + {%- if post.prev %} - {% endif %} + {%- endif %}
    - {% endif %} + {%- endif %} - {% set isLast = loop.index % page.per_page === 0 %} - {% if is_index and not isLast %} + {%- set isLast = loop.index % page.per_page === 0 %} + {%- if is_index and not isLast %}
    - {% endif %} + {%- endif %}
    {######################} diff --git a/layout/_macro/sidebar.swig b/layout/_macro/sidebar.swig index 92a175d0d9..efd15a481e 100644 --- a/layout/_macro/sidebar.swig +++ b/layout/_macro/sidebar.swig @@ -10,9 +10,9 @@ diff --git a/layout/_partials/analytics/busuanzi-counter.swig b/layout/_partials/analytics/busuanzi-counter.swig index 9015cb647d..1cedae261a 100644 --- a/layout/_partials/analytics/busuanzi-counter.swig +++ b/layout/_partials/analytics/busuanzi-counter.swig @@ -1,27 +1,27 @@ -{% if theme.busuanzi_count.enable %} +{%- if theme.busuanzi_count.enable %}
    - {% if theme.busuanzi_count.total_visitors %} + {%- if theme.busuanzi_count.total_visitors %} - {% endif %} + {%- endif %} - {% if theme.busuanzi_count.total_visitors and theme.busuanzi_count.total_views %} + {%- if theme.busuanzi_count.total_visitors and theme.busuanzi_count.total_views %} | - {% endif %} + {%- endif %} - {% if theme.busuanzi_count.total_views %} + {%- if theme.busuanzi_count.total_views %} - {% endif %} + {%- endif %}
    -{% endif %} +{%- endif %} diff --git a/layout/_partials/analytics/cnzz-analytics.swig b/layout/_partials/analytics/cnzz-analytics.swig index 9693cda230..7aae102a9c 100644 --- a/layout/_partials/analytics/cnzz-analytics.swig +++ b/layout/_partials/analytics/cnzz-analytics.swig @@ -1,5 +1,5 @@ -{% if theme.cnzz_siteid %} +{%- if theme.cnzz_siteid %}
    -{% endif %} +{%- endif %} diff --git a/layout/_partials/analytics/tencent-analytics.swig b/layout/_partials/analytics/tencent-analytics.swig index adc1fc3fdf..194351f349 100644 --- a/layout/_partials/analytics/tencent-analytics.swig +++ b/layout/_partials/analytics/tencent-analytics.swig @@ -1,4 +1,4 @@ -{% if theme.tencent_analytics %} +{%- if theme.tencent_analytics %} -{% endif %} +{%- endif %} diff --git a/layout/_partials/analytics/tencent-mta.swig b/layout/_partials/analytics/tencent-mta.swig index d9cae35f54..d7044c8896 100644 --- a/layout/_partials/analytics/tencent-mta.swig +++ b/layout/_partials/analytics/tencent-mta.swig @@ -1,4 +1,4 @@ -{% if theme.tencent_mta %} +{%- if theme.tencent_mta %} -{% endif %} +{%- endif %} diff --git a/layout/_partials/comments.swig b/layout/_partials/comments.swig index e6f16d7a3a..3250cf4451 100644 --- a/layout/_partials/comments.swig +++ b/layout/_partials/comments.swig @@ -1,9 +1,9 @@ -{% if page.comments %} - {% if theme.injects.comment.length == 1 %} - {% set inject_item = theme.injects.comment[0] %} +{%- if page.comments %} + {%- if theme.injects.comment.length == 1 %} + {%- set inject_item = theme.injects.comment[0] %} {{ partial(inject_item.layout, inject_item.locals, inject_item.options) }} - {% endif %} -{# {% for inject_item in theme.injects.comment %} + {%- endif %} +{# {%- for inject_item in theme.injects.comment %} {{ partial(inject_item.layout, inject_item.locals, inject_item.options) }} -{% endfor %} #} -{% endif %} +{%- endfor %} #} +{%- endif %} diff --git a/layout/_partials/footer.swig b/layout/_partials/footer.swig index 1b3c81ceb7..41e5369a67 100644 --- a/layout/_partials/footer.swig +++ b/layout/_partials/footer.swig @@ -1,8 +1,8 @@
    {# -#}{% set current = date(Date.now(), "YYYY") %}{# -#}{% if theme.footer.beian.enable %}{# +#}{%- set current = date(Date.now(), "YYYY") %}{# +#}{%- if theme.footer.beian.enable %}{# #} {{ next_url('http://www.beian.miit.gov.cn', theme.footer.beian.icp + ' ') }}{# -#}{% endif %}{# +#}{%- endif %}{# #}© {% if theme.footer.since and theme.footer.since != current %}{{ theme.footer.since }} – {% endif %}{# #}{{ current }} @@ -10,51 +10,51 @@ {{ theme.footer.copyright || author }} - {% if config.symbols_count_time.total_symbols %} + {%- if config.symbols_count_time.total_symbols %} | - {% if theme.symbols_count_time.item_text_total %} + {%- if theme.symbols_count_time.item_text_total %} {{ __('symbols_count_time.count_total') + __('symbol.colon') }} - {% endif %} + {%- endif %} {# #}{{ symbolsCountTotal(site) }}{# #} - {% endif %} + {%- endif %} - {% if config.symbols_count_time.total_time %} + {%- if config.symbols_count_time.total_time %} | - {% if theme.symbols_count_time.item_text_total %} + {%- if theme.symbols_count_time.item_text_total %} {{ __('symbols_count_time.time_total')}} ≈ - {% endif %} + {%- endif %} {# #}{{ symbolsTimeTotal(site, theme.symbols_count_time.awl, theme.symbols_count_time.wpm, __('symbols_count_time.time_minutes')) }}{# #} - {% endif %} + {%- endif %}
    -{% if theme.footer.powered.enable %} +{%- if theme.footer.powered.enable %}
    {# #}{{ __('footer.powered', next_url('https://hexo.io', 'Hexo', {class: 'theme-link'})) }}{# - #}{% if theme.footer.powered.version %} v{{ hexo_env('version') }}{% endif %}{# + #}{%- if theme.footer.powered.version %} v{{ hexo_env('version') }}{%- endif %}{# #}
    -{% endif %} +{%- endif %} -{% if theme.footer.powered.enable and theme.footer.theme.enable %} +{%- if theme.footer.powered.enable and theme.footer.theme.enable %} | -{% endif %} +{%- endif %} -{% if theme.footer.theme.enable %} +{%- if theme.footer.theme.enable %}
    {# #}{{ __('footer.theme') }} – {{ next_url('https://theme-next.org', 'NexT.' + theme.scheme, {class: 'theme-link'}) }}{# - #}{% if theme.footer.theme.version %} v{{ version }}{% endif %}{# + #}{%- if theme.footer.theme.version %} v{{ version }}{%- endif %}{# #}
    -{% endif %} +{%- endif %} -{% for inject_item in theme.injects.footer %} +{%- for inject_item in theme.injects.footer %} {{ partial(inject_item.layout, inject_item.locals, inject_item.options) }} -{% endfor %} +{%- endfor %} diff --git a/layout/_partials/github-banner.swig b/layout/_partials/github-banner.swig index 963d7a5e4e..4446fdd78a 100644 --- a/layout/_partials/github-banner.swig +++ b/layout/_partials/github-banner.swig @@ -1,8 +1,8 @@ -{% if theme.github_banner.enable %} - {% set github_URL = theme.github_banner.permalink %} - {% set github_title = theme.github_banner.title %} +{%- if theme.github_banner.enable %} + {%- set github_URL = theme.github_banner.permalink %} + {%- set github_title = theme.github_banner.title %} - {% set github_image = '' %} + {%- set github_image = '' %} {{ next_url(github_URL, github_image, {class: 'github-corner', title: github_title, "aria-label": github_title}) }} -{% endif %} +{%- endif %} diff --git a/layout/_partials/head/head-unique.swig b/layout/_partials/head/head-unique.swig index dcdbbc962a..69f20fb9fe 100644 --- a/layout/_partials/head/head-unique.swig +++ b/layout/_partials/head/head-unique.swig @@ -7,18 +7,18 @@ }) }} -{% if theme.rss === '' and config.feed and config.feed.path %} - {% set theme.rss = config.feed.path %} -{% endif %} -{% if theme.rss %} +{%- if theme.rss === '' and config.feed and config.feed.path %} + {%- set theme.rss = config.feed.path %} +{%- endif %} +{%- if theme.rss %} -{% endif %} +{%- endif %} -{% if theme.canonical %} - {% set without_index = url.replace('index.html', '') %} - {% set without_html = without_index.replace('.html', '') %} +{%- if theme.canonical %} + {%- set without_index = url.replace('index.html', '') %} + {%- set without_html = without_index.replace('.html', '') %} -{% endif %} +{%- endif %} {# Exports some front-matter variables to Front-End #} -{% endif %} +{%- endif %} {# Export some HEXO Configurations to Front-End #} diff --git a/layout/_partials/share/needsharebutton.swig b/layout/_partials/share/needsharebutton.swig index 522fd2ea57..8b4075c4d7 100644 --- a/layout/_partials/share/needsharebutton.swig +++ b/layout/_partials/share/needsharebutton.swig @@ -1,29 +1,29 @@ -{% if theme.needmoreshare2.float.enable %} +{%- if theme.needmoreshare2.float.enable %}
    -{% endif %} +{%- endif %} -{% set needmoreshare2_js = url_for(theme.vendors._internal + '/needsharebutton/needsharebutton.js') %} -{% if theme.vendors.needmoreshare2_js %} - {% set needmoreshare2_js = theme.vendors.needmoreshare2_js %} -{% endif %} +{%- set needmoreshare2_js = url_for(theme.vendors._internal + '/needsharebutton/needsharebutton.js') %} +{%- if theme.vendors.needmoreshare2_js %} + {%- set needmoreshare2_js = theme.vendors.needmoreshare2_js %} +{%- endif %} diff --git a/layout/_partials/sidebar/site-overview.swig b/layout/_partials/sidebar/site-overview.swig index 328fa6f02e..534aaed467 100644 --- a/layout/_partials/sidebar/site-overview.swig +++ b/layout/_partials/sidebar/site-overview.swig @@ -1,138 +1,138 @@ -{% if theme.site_state %} +{%- if theme.site_state %} -{% endif %} +{%- endif %} -{% if theme.rss %} +{%- if theme.rss %}
    RSS
    -{% endif %} +{%- endif %} -{% if theme.chat.enable and theme.chat.service !== '' %} +{%- if theme.chat.enable and theme.chat.service !== '' %}
    - {% if theme.chat.service == 'chatra' and theme.chatra.enable %} + {%- if theme.chat.service == 'chatra' and theme.chatra.enable %} - {% endif %} - {% if theme.chat.service == 'tidio' and theme.tidio.enable %} + {%- endif %} + {%- if theme.chat.service == 'tidio' and theme.tidio.enable %} - {% endif %} - {% if theme.chat.icon %}{% endif %} + {%- endif %} + {%- if theme.chat.icon %}{%- endif %} {{ theme.chat.text }}
    -{% endif %} +{%- endif %} -{% if theme.social %} +{%- if theme.social %}
    - {% for name, link in theme.social %} + {%- for name, link in theme.social %} - {% set sidebarURL = link.split('||')[0] | trim %} - {% if not (theme.social_icons.enable) or (not theme.social_icons.icons_only) %} - {% set sidebarText = name %} - {% endif %} - {% if theme.social_icons.enable %} - {% set sidebarIcon = '' %} - {% endif %} + {%- set sidebarURL = link.split('||')[0] | trim %} + {%- if not (theme.social_icons.enable) or (not theme.social_icons.icons_only) %} + {%- set sidebarText = name %} + {%- endif %} + {%- if theme.social_icons.enable %} + {%- set sidebarIcon = '' %} + {%- endif %} {{ next_url(sidebarURL, sidebarIcon + sidebarText, {title: name + ' → ' + sidebarURL}) }} - {% endfor %} + {%- endfor %}
    -{% endif %} +{%- endif %} -{% if theme.creative_commons.license and theme.creative_commons.sidebar %} +{%- if theme.creative_commons.license and theme.creative_commons.sidebar %}
    - {% set ccLanguage = theme.creative_commons.language %} - {% if theme.creative_commons.license === 'zero' %} - {% set ccType = 'publicdomain/zero/1.0/' + ccLanguage %} + {%- set ccLanguage = theme.creative_commons.language %} + {%- if theme.creative_commons.license === 'zero' %} + {%- set ccType = 'publicdomain/zero/1.0/' + ccLanguage %} {% else %} - {% set ccType = 'licenses/' + theme.creative_commons.license + '/4.0/' + ccLanguage %} - {% endif %} - {% set ccURL = 'https://creativecommons.org/' + ccType %} - {% set ccImage = 'Creative Commons' %} + {%- set ccType = 'licenses/' + theme.creative_commons.license + '/4.0/' + ccLanguage %} + {%- endif %} + {%- set ccURL = 'https://creativecommons.org/' + ccType %} + {%- set ccImage = 'Creative Commons' %} {{ next_url(ccURL, ccImage, {class: 'cc-opacity'}) }}
    -{% endif %} +{%- endif %} {# Blogroll #} -{% if theme.links %} +{%- if theme.links %}
    {{ theme.links_title }}
      - {% for blogrollText, blogrollURL in theme.links %} + {%- for blogrollText, blogrollURL in theme.links %}
    • {{ next_url(blogrollURL, blogrollText, {title: blogrollURL}) }}
      • - {% endfor %} + {%- endfor %}
    -{% endif %} +{%- endif %} diff --git a/layout/_scripts/commons.swig b/layout/_scripts/commons.swig index c6050614e4..6370629bca 100644 --- a/layout/_scripts/commons.swig +++ b/layout/_scripts/commons.swig @@ -1,4 +1,4 @@ -{% if theme.motion.enable %} +{%- if theme.motion.enable %} -{% endif %} +{%- endif %} diff --git a/layout/_scripts/exturl.swig b/layout/_scripts/exturl.swig index 832d4d9a73..7731be1532 100644 --- a/layout/_scripts/exturl.swig +++ b/layout/_scripts/exturl.swig @@ -1,3 +1,3 @@ -{% if theme.exturl %} +{%- if theme.exturl %} -{% endif %} +{%- endif %} diff --git a/layout/_scripts/schemes/muse.swig b/layout/_scripts/schemes/muse.swig index b19238bfe4..80a332c85e 100644 --- a/layout/_scripts/schemes/muse.swig +++ b/layout/_scripts/schemes/muse.swig @@ -4,6 +4,6 @@ ] %} -{% for script in scripts %} +{%- for script in scripts %} -{% endfor %} +{%- endfor %} diff --git a/layout/_scripts/schemes/pisces.swig b/layout/_scripts/schemes/pisces.swig index 794965d0b7..c83bb3ef08 100644 --- a/layout/_scripts/schemes/pisces.swig +++ b/layout/_scripts/schemes/pisces.swig @@ -5,6 +5,6 @@ ] %} -{% for script in scripts %} +{%- for script in scripts %} -{% endfor %} +{%- endfor %} diff --git a/layout/_scripts/scroll-cookie.swig b/layout/_scripts/scroll-cookie.swig index 09c158b634..5b40ba9bac 100644 --- a/layout/_scripts/scroll-cookie.swig +++ b/layout/_scripts/scroll-cookie.swig @@ -1,4 +1,4 @@ -{% if theme.save_scroll %} +{%- if theme.save_scroll %} -{% endif %} +{%- endif %} diff --git a/layout/_scripts/three.swig b/layout/_scripts/three.swig index 0ea6ee4e53..78d1415661 100644 --- a/layout/_scripts/three.swig +++ b/layout/_scripts/three.swig @@ -1,20 +1,20 @@ -{% if theme.three.enable and theme.three.delay %} - {% set three_url = url_for(theme.vendors._internal + '/three/three.min.js') %} - {% if theme.vendors.three %} - {% set three_url = theme.vendors.three %} - {% endif %} +{%- if theme.three.enable and theme.three.delay %} + {%- set three_url = url_for(theme.vendors._internal + '/three/three.min.js') %} + {%- if theme.vendors.three %} + {%- set three_url = theme.vendors.three %} + {%- endif %} - {% if theme.three.three_waves %} - {% set waves = theme.vendors.three_waves | default(url_for(theme.vendors._internal + '/three/three-waves.min.js')) %} - {% endif %} + {%- if theme.three.three_waves %} + {%- set waves = theme.vendors.three_waves | default(url_for(theme.vendors._internal + '/three/three-waves.min.js')) %} + {%- endif %} - {% if theme.three.canvas_lines %} - {% set lines = theme.vendors.canvas_lines | default(url_for(theme.vendors._internal + '/three/canvas_lines.min.js')) %} - {% endif %} + {%- if theme.three.canvas_lines %} + {%- set lines = theme.vendors.canvas_lines | default(url_for(theme.vendors._internal + '/three/canvas_lines.min.js')) %} + {%- endif %} - {% if theme.three.canvas_sphere %} - {% set sphere = theme.vendors.canvas_sphere | default(url_for(theme.vendors._internal + '/three/canvas_sphere.min.js')) %} - {% endif %} + {%- if theme.three.canvas_sphere %} + {%- set sphere = theme.vendors.canvas_sphere | default(url_for(theme.vendors._internal + '/three/canvas_sphere.min.js')) %} + {%- endif %} -{% endif %} +{%- endif %} diff --git a/layout/_scripts/vendors.swig b/layout/_scripts/vendors.swig index 2e700a2fe4..f87f04812c 100644 --- a/layout/_scripts/vendors.swig +++ b/layout/_scripts/vendors.swig @@ -1,76 +1,76 @@ -{% set js_vendors = {} %} -{% set js_defer_vendors = {} %} -{% set js_vendors.jquery = 'jquery/index.js?v=3.4.1' %} +{%- set js_vendors = {} %} +{%- set js_defer_vendors = {} %} +{%- set js_vendors.jquery = 'jquery/index.js?v=3.4.1' %} -{% if theme.fancybox %} - {% set js_vendors.fancybox = 'fancybox/source/jquery.fancybox.pack.js' %} -{% endif %} +{%- if theme.fancybox %} + {%- set js_vendors.fancybox = 'fancybox/source/jquery.fancybox.pack.js' %} +{%- endif %} -{% if theme.mediumzoom %} - {% set js_vendors.mediumzoom = 'mediumzoom/medium-zoom.min.js' %} -{% endif %} +{%- if theme.mediumzoom %} + {%- set js_vendors.mediumzoom = 'mediumzoom/medium-zoom.min.js' %} +{%- endif %} -{% if theme.lazyload %} - {% set js_vendors.lazyload = 'lazyload/lozad.min.js?v=1.10.0' %} -{% endif %} +{%- if theme.lazyload %} + {%- set js_vendors.lazyload = 'lazyload/lozad.min.js?v=1.10.0' %} +{%- endif %} -{% if theme.pangu %} - {% set js_vendors.pangu = 'pangu/dist/pangu.min.js?v=4.0.7' %} -{% endif %} +{%- if theme.pangu %} + {%- set js_vendors.pangu = 'pangu/dist/pangu.min.js?v=4.0.7' %} +{%- endif %} -{% if theme.reading_progress.enable %} - {% set js_vendors.reading_progress = 'reading_progress/reading_progress.js' %} -{% endif %} +{%- if theme.reading_progress.enable %} + {%- set js_vendors.reading_progress = 'reading_progress/reading_progress.js' %} +{%- endif %} -{% if theme.motion.enable %} - {% set js_vendors.velocity = 'velocity/velocity.min.js?v=1.2.1' %} - {% set js_vendors.velocity_ui = 'velocity/velocity.ui.min.js?v=1.2.1' %} -{% endif %} +{%- if theme.motion.enable %} + {%- set js_vendors.velocity = 'velocity/velocity.min.js?v=1.2.1' %} + {%- set js_vendors.velocity_ui = 'velocity/velocity.ui.min.js?v=1.2.1' %} +{%- endif %} -{% if theme.three.enable and not theme.three.delay %} - {% if theme.three.three_waves %} - {% set js_defer_vendors.three = 'three/three.min.js' %} - {% set js_defer_vendors.three_waves = 'three/three-waves.min.js' %} - {% endif %} - {% if theme.three.canvas_lines %} - {% set js_defer_vendors.three = 'three/three.min.js' %} - {% set js_defer_vendors.canvas_lines = 'three/canvas_lines.min.js' %} - {% endif %} - {% if theme.three.canvas_sphere %} - {% set js_defer_vendors.three = 'three/three.min.js' %} - {% set js_defer_vendors.canvas_sphere = 'three/canvas_sphere.min.js' %} - {% endif %} -{% endif %} +{%- if theme.three.enable and not theme.three.delay %} + {%- if theme.three.three_waves %} + {%- set js_defer_vendors.three = 'three/three.min.js' %} + {%- set js_defer_vendors.three_waves = 'three/three-waves.min.js' %} + {%- endif %} + {%- if theme.three.canvas_lines %} + {%- set js_defer_vendors.three = 'three/three.min.js' %} + {%- set js_defer_vendors.canvas_lines = 'three/canvas_lines.min.js' %} + {%- endif %} + {%- if theme.three.canvas_sphere %} + {%- set js_defer_vendors.three = 'three/three.min.js' %} + {%- set js_defer_vendors.canvas_sphere = 'three/canvas_sphere.min.js' %} + {%- endif %} +{%- endif %} -{% if theme.canvas_nest.enable %} - {% if theme.canvas_nest.onmobile %} - {% set canvas_nest_uri = url_for(theme.vendors._internal + '/canvas-nest/canvas-nest.min.js') %} - {% if theme.vendors.canvas_nest %} - {% set canvas_nest_uri = theme.vendors.canvas_nest %} - {% endif %} +{%- if theme.canvas_nest.enable %} + {%- if theme.canvas_nest.onmobile %} + {%- set canvas_nest_uri = url_for(theme.vendors._internal + '/canvas-nest/canvas-nest.min.js') %} + {%- if theme.vendors.canvas_nest %} + {%- set canvas_nest_uri = theme.vendors.canvas_nest %} + {%- endif %} {% else %} - {% set canvas_nest_uri = url_for(theme.vendors._internal + '/canvas-nest/canvas-nest-nomobile.min.js') %} - {% if theme.vendors.canvas_nest_nomobile %} - {% set canvas_nest_uri = theme.vendors.canvas_nest_nomobile %} - {% endif %} - {% endif %} + {%- set canvas_nest_uri = url_for(theme.vendors._internal + '/canvas-nest/canvas-nest-nomobile.min.js') %} + {%- if theme.vendors.canvas_nest_nomobile %} + {%- set canvas_nest_uri = theme.vendors.canvas_nest_nomobile %} + {%- endif %} + {%- endif %} -{% endif %} +{%- endif %} -{% if theme.canvas_ribbon.enable %} - {% set canvas_ribbon_uri = url_for(theme.vendors._internal + '/canvas-ribbon/canvas-ribbon.js') %} - {% if theme.vendors.canvas_ribbon %} - {% set canvas_ribbon_uri = theme.vendors.canvas_ribbon %} - {% endif %} +{%- if theme.canvas_ribbon.enable %} + {%- set canvas_ribbon_uri = url_for(theme.vendors._internal + '/canvas-ribbon/canvas-ribbon.js') %} + {%- if theme.vendors.canvas_ribbon %} + {%- set canvas_ribbon_uri = theme.vendors.canvas_ribbon %} + {%- endif %} -{% endif %} +{%- endif %} -{% for name, internal in js_vendors %} - {% set internal_script = url_for(theme.vendors._internal + '/' + internal) %} +{%- for name, internal in js_vendors %} + {%- set internal_script = url_for(theme.vendors._internal + '/' + internal) %} -{% endfor %} +{%- endfor %} -{% for name, internal in js_defer_vendors %} - {% set internal_script = url_for(theme.vendors._internal + '/' + internal) %} +{%- for name, internal in js_defer_vendors %} + {%- set internal_script = url_for(theme.vendors._internal + '/' + internal) %} -{% endfor %} +{%- endfor %} diff --git a/layout/_third-party/analytics/application-insights.swig b/layout/_third-party/analytics/application-insights.swig index 9844cbf4c8..6cd9c718e7 100644 --- a/layout/_third-party/analytics/application-insights.swig +++ b/layout/_third-party/analytics/application-insights.swig @@ -1,4 +1,4 @@ -{% if theme.application_insights %} +{%- if theme.application_insights %} -{% endif %} +{%- endif %} diff --git a/layout/_third-party/analytics/baidu-analytics.swig b/layout/_third-party/analytics/baidu-analytics.swig index 11d1342418..f59e4838f3 100644 --- a/layout/_third-party/analytics/baidu-analytics.swig +++ b/layout/_third-party/analytics/baidu-analytics.swig @@ -1,4 +1,4 @@ -{% if theme.baidu_analytics %} +{%- if theme.baidu_analytics %} -{% endif %} +{%- endif %} diff --git a/layout/_third-party/analytics/firestore.swig b/layout/_third-party/analytics/firestore.swig index 1b0610aa1c..194b96eb1f 100644 --- a/layout/_third-party/analytics/firestore.swig +++ b/layout/_third-party/analytics/firestore.swig @@ -1,9 +1,9 @@ -{% if theme.firestore.enable %} +{%- if theme.firestore.enable %} - {% if theme.firestore.bluebird %} + {%- if theme.firestore.bluebird %} - {% endif %} + {%- endif %} -{% endif %} +{%- endif %} diff --git a/layout/_third-party/analytics/google-analytics.swig b/layout/_third-party/analytics/google-analytics.swig index 7f7ec6f28f..8d931a350c 100644 --- a/layout/_third-party/analytics/google-analytics.swig +++ b/layout/_third-party/analytics/google-analytics.swig @@ -1,4 +1,4 @@ -{% if theme.google_analytics.tracking_id %} +{%- if theme.google_analytics.tracking_id %} -{% endif %} +{%- endif %} diff --git a/layout/_third-party/analytics/growingio.swig b/layout/_third-party/analytics/growingio.swig index fdbb00fe10..08b7724c3d 100644 --- a/layout/_third-party/analytics/growingio.swig +++ b/layout/_third-party/analytics/growingio.swig @@ -1,7 +1,7 @@ -{% if theme.growingio_analytics %} +{%- if theme.growingio_analytics %} -{% endif %} +{%- endif %} diff --git a/layout/_third-party/analytics/lean-analytics.swig b/layout/_third-party/analytics/lean-analytics.swig index 9974e01dcc..64bb1bdf37 100644 --- a/layout/_third-party/analytics/lean-analytics.swig +++ b/layout/_third-party/analytics/lean-analytics.swig @@ -1,7 +1,7 @@ -{% if theme.leancloud_visitors.enable and !theme.valine.visitor %} +{%- if theme.leancloud_visitors.enable and !theme.valine.visitor %} {# custom analytics part create by xiamo; edited by LEAFERx #} -{% endif %} +{%- endif %} diff --git a/layout/_third-party/baidu-push.swig b/layout/_third-party/baidu-push.swig index 758c439285..b86c8e33dd 100644 --- a/layout/_third-party/baidu-push.swig +++ b/layout/_third-party/baidu-push.swig @@ -1,4 +1,4 @@ -{% if theme.baidu_push %} +{%- if theme.baidu_push %} -{% endif %} +{%- endif %} diff --git a/layout/_third-party/bookmark.swig b/layout/_third-party/bookmark.swig index 6933ab3c11..d25de7bea4 100644 --- a/layout/_third-party/bookmark.swig +++ b/layout/_third-party/bookmark.swig @@ -1,14 +1,14 @@ -{% if theme.bookmark and theme.bookmark.enable %} - {% set bookmark_uri = url_for(theme.vendors._internal + '/bookmark/bookmark.min.js?v=1.0') %} - {% if theme.vendors.bookmark %} - {% set bookmark_uri = theme.vendors.bookmark %} - {% endif %} +{%- if theme.bookmark and theme.bookmark.enable %} + {%- set bookmark_uri = url_for(theme.vendors._internal + '/bookmark/bookmark.min.js?v=1.0') %} + {%- if theme.vendors.bookmark %} + {%- set bookmark_uri = theme.vendors.bookmark %} + {%- endif %} -{% endif %} +{%- endif %} diff --git a/layout/_third-party/chat/chatra.swig b/layout/_third-party/chat/chatra.swig index 42f0e11568..ab36b300eb 100644 --- a/layout/_third-party/chat/chatra.swig +++ b/layout/_third-party/chat/chatra.swig @@ -1,12 +1,12 @@ -{% if theme.chatra.enable %} - {% if theme.chatra.embed %} +{%- if theme.chatra.enable %} + {%- if theme.chatra.embed %} - {% endif %} + {%- endif %} -{% endif %} +{%- endif %} diff --git a/layout/_third-party/chat/tidio.swig b/layout/_third-party/chat/tidio.swig index d380d210b6..a0fcc56088 100644 --- a/layout/_third-party/chat/tidio.swig +++ b/layout/_third-party/chat/tidio.swig @@ -1,3 +1,3 @@ -{% if theme.tidio.enable %} +{%- if theme.tidio.enable %} -{% endif %} +{%- endif %} diff --git a/layout/_third-party/comments/changyan.swig b/layout/_third-party/comments/changyan.swig index cf8fd2c251..741b2a4151 100644 --- a/layout/_third-party/comments/changyan.swig +++ b/layout/_third-party/comments/changyan.swig @@ -1,4 +1,4 @@ -{% if is_home() %} +{%- if is_home() %} {% elif page.comments %} -{% endif %} +{%- endif %} diff --git a/layout/_third-party/comments/disqus.swig b/layout/_third-party/comments/disqus.swig index a2f0144279..98f59d4fd5 100644 --- a/layout/_third-party/comments/disqus.swig +++ b/layout/_third-party/comments/disqus.swig @@ -1,4 +1,4 @@ -{% if theme.disqus.count %} +{%- if theme.disqus.count %} -{% endif %} -{% if page.comments %} +{%- endif %} +{%- if page.comments %} -{% endif %} +{%- endif %} diff --git a/layout/_third-party/comments/disqusjs.swig b/layout/_third-party/comments/disqusjs.swig index ae512f8584..122044ee2a 100644 --- a/layout/_third-party/comments/disqusjs.swig +++ b/layout/_third-party/comments/disqusjs.swig @@ -1,14 +1,14 @@ -{% if page.comments %} -{% set disqusjs_css_url = '//cdn.jsdelivr.net/npm/disqusjs@1/dist/disqusjs.css' %} -{% if theme.vendors.disqusjs_css %} - {% set disqusjs_css_url = theme.vendors.disqusjs_css %} -{% endif %} +{%- if page.comments %} +{%- set disqusjs_css_url = '//cdn.jsdelivr.net/npm/disqusjs@1/dist/disqusjs.css' %} +{%- if theme.vendors.disqusjs_css %} + {%- set disqusjs_css_url = theme.vendors.disqusjs_css %} +{%- endif %} -{% set disqusjs_js_url = '//cdn.jsdelivr.net/npm/disqusjs@1/dist/disqus.js' %} -{% if theme.vendors.disqusjs_js %} - {% set disqusjs_js_url = theme.vendors.disqusjs_js %} -{% endif %} +{%- set disqusjs_js_url = '//cdn.jsdelivr.net/npm/disqusjs@1/dist/disqus.js' %} +{%- if theme.vendors.disqusjs_js %} + {%- set disqusjs_js_url = theme.vendors.disqusjs_js %} +{%- endif %} -{% endif %} +{%- endif %} diff --git a/layout/_third-party/comments/gitalk.swig b/layout/_third-party/comments/gitalk.swig index aa03b88dd8..7a7807c6d1 100644 --- a/layout/_third-party/comments/gitalk.swig +++ b/layout/_third-party/comments/gitalk.swig @@ -1,20 +1,20 @@ -{% if page.comments %} -{% set gitalk_js_url = '//cdn.jsdelivr.net/npm/gitalk@1/dist/gitalk.min.js' %} -{% if theme.vendors.gitalk_js %} - {% set gitalk_js_url = theme.vendors.gitalk_js %} -{% endif %} +{%- if page.comments %} +{%- set gitalk_js_url = '//cdn.jsdelivr.net/npm/gitalk@1/dist/gitalk.min.js' %} +{%- if theme.vendors.gitalk_js %} + {%- set gitalk_js_url = theme.vendors.gitalk_js %} +{%- endif %} -{% set gitalk_css_url = '//cdn.jsdelivr.net/npm/gitalk@1/dist/gitalk.min.css' %} -{% if theme.vendors.gitalk_css %} - {% set gitalk_css_url = theme.vendors.gitalk_css %} -{% endif %} +{%- set gitalk_css_url = '//cdn.jsdelivr.net/npm/gitalk@1/dist/gitalk.min.css' %} +{%- if theme.vendors.gitalk_css %} + {%- set gitalk_css_url = theme.vendors.gitalk_css %} +{%- endif %} -{% set md5_url = '//cdn.jsdelivr.net/npm/js-md5@0.7.3/src/md5.min.js' %} -{% if theme.vendors.md5 %} - {% set md5_url = theme.vendors.md5 %} -{% endif %} +{%- set md5_url = '//cdn.jsdelivr.net/npm/js-md5@0.7.3/src/md5.min.js' %} +{%- if theme.vendors.md5 %} + {%- set md5_url = theme.vendors.md5 %} +{%- endif %} -{% endif %} +{%- endif %} diff --git a/layout/_third-party/comments/livere.swig b/layout/_third-party/comments/livere.swig index f19164850b..1b78cc0301 100644 --- a/layout/_third-party/comments/livere.swig +++ b/layout/_third-party/comments/livere.swig @@ -1,8 +1,8 @@ -{% if page.comments %} -{% set liveRefer = page.path %} -{% if not is_post() %} - {% set liveRefer = page.path.replace('index.html', '') %} -{% endif %} +{%- if page.comments %} +{%- set liveRefer = page.path %} +{%- if not is_post() %} + {%- set liveRefer = page.path.replace('index.html', '') %} +{%- endif %} -{% endif %} +{%- endif %} diff --git a/layout/_third-party/comments/valine.swig b/layout/_third-party/comments/valine.swig index 5b553099ba..bf9fe2b3ec 100644 --- a/layout/_third-party/comments/valine.swig +++ b/layout/_third-party/comments/valine.swig @@ -1,7 +1,7 @@ -{% set valine_uri = '//unpkg.com/valine/dist/Valine.min.js' %} -{% if theme.vendors.valine %} - {% set valine_uri = theme.vendors.valine %} -{% endif %} +{%- set valine_uri = '//unpkg.com/valine/dist/Valine.min.js' %} +{%- if theme.vendors.valine %} + {%- set valine_uri = theme.vendors.valine %} +{%- endif %} -{% endif %} +{%- endif %} diff --git a/layout/_third-party/math/index.swig b/layout/_third-party/math/index.swig index 12eab89494..e92a564213 100644 --- a/layout/_third-party/math/index.swig +++ b/layout/_third-party/math/index.swig @@ -1,20 +1,20 @@ -{% if theme.math.enable %} - {% set is_index_has_math = false %} +{%- if theme.math.enable %} + {%- set is_index_has_math = false %} {# At home, check if there has `mathjax: true` post #} - {% if is_home() %} - {% for post in page.posts %} - {% if post.mathjax and not is_index_has_math %} - {% set is_index_has_math = true %} - {% endif %} - {% endfor %} - {% endif %} + {%- if is_home() %} + {%- for post in page.posts %} + {%- if post.mathjax and not is_index_has_math %} + {%- set is_index_has_math = true %} + {%- endif %} + {%- endfor %} + {%- endif %} - {% if not theme.math.per_page or (is_index_has_math or page.mathjax) %} - {% if theme.math.engine == 'mathjax' %} + {%- if not theme.math.per_page or (is_index_has_math or page.mathjax) %} + {%- if theme.math.engine == 'mathjax' %} {% include 'mathjax.swig' %} {% elif theme.math.engine == 'katex' %} {% include 'katex.swig' %} - {% endif %} - {% endif %} -{% endif %} + {%- endif %} + {%- endif %} +{%- endif %} diff --git a/layout/_third-party/math/katex.swig b/layout/_third-party/math/katex.swig index ea7ad1620f..3f4cb1d621 100644 --- a/layout/_third-party/math/katex.swig +++ b/layout/_third-party/math/katex.swig @@ -1,9 +1,9 @@ -{% if theme.math.katex.copy_tex.enable %} - {% if theme.math.katex.copy_tex.copy_tex_js %} +{%- if theme.math.katex.copy_tex.enable %} + {%- if theme.math.katex.copy_tex.copy_tex_js %} - {% endif %} - {% if theme.math.katex.copy_tex.copy_tex_css %} + {%- endif %} + {%- if theme.math.katex.copy_tex.copy_tex_css %} - {% endif %} -{% endif %} + {%- endif %} +{%- endif %} diff --git a/layout/_third-party/math/mathjax.swig b/layout/_third-party/math/mathjax.swig index 47cb650e00..2ac17b31d6 100644 --- a/layout/_third-party/math/mathjax.swig +++ b/layout/_third-party/math/mathjax.swig @@ -1,7 +1,7 @@ - {% endif %} -{% endif %} + {%- endif %} +{%- endif %} diff --git a/layout/_third-party/rating.swig b/layout/_third-party/rating.swig index e51e0945a2..0fd9513032 100644 --- a/layout/_third-party/rating.swig +++ b/layout/_third-party/rating.swig @@ -1,4 +1,4 @@ -{% if theme.rating.enable and (not is_home() and is_post()) %} +{%- if theme.rating.enable and (not is_home() and is_post()) %} -{% endif %} +{%- endif %} diff --git a/layout/_third-party/schedule.swig b/layout/_third-party/schedule.swig index 2055c89f63..d979e293c4 100644 --- a/layout/_third-party/schedule.swig +++ b/layout/_third-party/schedule.swig @@ -1,4 +1,4 @@ -{% if theme.calendar.enable && page.type === 'schedule' %} +{%- if theme.calendar.enable && page.type === 'schedule' %} -{% endif %} +{%- endif %} diff --git a/layout/_third-party/search/algolia-search.swig b/layout/_third-party/search/algolia-search.swig index 8c52deb254..767fea0a50 100644 --- a/layout/_third-party/search/algolia-search.swig +++ b/layout/_third-party/search/algolia-search.swig @@ -1,14 +1,14 @@ {# S: Include Algolia instantsearch.js library #} -{% set algolia_instant_css = url_for(theme.vendors._internal + '/algolia-instant-search/instantsearch.min.css') %} -{% if theme.vendors.algolia_instant_css %} - {% set algolia_instant_css = theme.vendors.algolia_instant_css %} -{% endif %} +{%- set algolia_instant_css = url_for(theme.vendors._internal + '/algolia-instant-search/instantsearch.min.css') %} +{%- if theme.vendors.algolia_instant_css %} + {%- set algolia_instant_css = theme.vendors.algolia_instant_css %} +{%- endif %} -{% set algolia_instant_js = url_for(theme.vendors._internal + '/algolia-instant-search/instantsearch.min.js') %} -{% if theme.vendors.algolia_instant_js %} - {% set algolia_instant_js = theme.vendors.algolia_instant_js %} -{% endif %} +{%- set algolia_instant_js = url_for(theme.vendors._internal + '/algolia-instant-search/instantsearch.min.js') %} +{%- if theme.vendors.algolia_instant_js %} + {%- set algolia_instant_js = theme.vendors.algolia_instant_js %} +{%- endif %} {# E: Include Algolia instantsearch.js library #} diff --git a/layout/_third-party/search/index.swig b/layout/_third-party/search/index.swig index b23ac3fd77..9e621d11ae 100644 --- a/layout/_third-party/search/index.swig +++ b/layout/_third-party/search/index.swig @@ -1,7 +1,7 @@ -{% if theme.algolia_search.enable %} +{%- if theme.algolia_search.enable %} {% include 'algolia-search.swig' %} {% elif theme.swiftype_key %} {% include 'swiftype.swig' %} {% elif theme.local_search.enable %} {% include 'localsearch.swig' %} -{% endif %} +{%- endif %} diff --git a/layout/_third-party/tags/mermaid.swig b/layout/_third-party/tags/mermaid.swig index a7859a6d4f..78296e5a98 100644 --- a/layout/_third-party/tags/mermaid.swig +++ b/layout/_third-party/tags/mermaid.swig @@ -1,4 +1,4 @@ -{% if theme.mermaid.enable %} +{%- if theme.mermaid.enable %} -{% endif %} +{%- endif %} diff --git a/layout/_third-party/tags/pdf.swig b/layout/_third-party/tags/pdf.swig index 4b65f3e0f5..54cdad0e9e 100644 --- a/layout/_third-party/tags/pdf.swig +++ b/layout/_third-party/tags/pdf.swig @@ -1,4 +1,4 @@ -{% if theme.pdf.enable %} +{%- if theme.pdf.enable %} -{% endif %} +{%- endif %} diff --git a/layout/_third-party/vkontakte-api.swig b/layout/_third-party/vkontakte-api.swig index 4ed0c624a6..bf7c4da85d 100644 --- a/layout/_third-party/vkontakte-api.swig +++ b/layout/_third-party/vkontakte-api.swig @@ -1,4 +1,4 @@ -{% if theme.vkontakte_api.enable %} +{%- if theme.vkontakte_api.enable %}
    -{% endif %} +{%- endif %} diff --git a/layout/archive.swig b/layout/archive.swig index e4c2a68ffc..2f3061c346 100644 --- a/layout/archive.swig +++ b/layout/archive.swig @@ -15,39 +15,39 @@
    - {% if theme.cheers %} + {%- if theme.cheers %} - {% set cheers %} - {% set posts_length = site.posts.length %} - {% if posts_length > 210 %} {% set cheers = 'excellent' %} - {% elif posts_length > 130 %} {% set cheers = 'great' %} - {% elif posts_length > 80 %} {% set cheers = 'good' %} - {% elif posts_length > 50 %} {% set cheers = 'nice' %} - {% elif posts_length > 30 %} {% set cheers = 'ok' %} + {%- set cheers %} + {%- set posts_length = site.posts.length %} + {%- if posts_length > 210 %} {%- set cheers = 'excellent' %} + {% elif posts_length > 130 %} {%- set cheers = 'great' %} + {% elif posts_length > 80 %} {%- set cheers = 'good' %} + {% elif posts_length > 50 %} {%- set cheers = 'nice' %} + {% elif posts_length > 30 %} {%- set cheers = 'ok' %} {% else %} - {% set cheers = 'um' %} - {% endif %} + {%- set cheers = 'um' %} + {%- endif %} {{ __('cheers.' + cheers) }}! {{ _p("counter.archive_posts", site.posts.length) }} {{ __('keep_on') }} - {% endif %} + {%- endif %} - {% for post in page.posts %} + {%- for post in page.posts %} {# Show year #} - {% set year %} - {% set post.year = date(post.date, 'YYYY') %} + {%- set year %} + {%- set post.year = date(post.date, 'YYYY') %} - {% if post.year !== year %} - {% set year = post.year %} + {%- if post.year !== year %} + {%- set year = post.year %}
    - <{% if theme.seo %}h2{% else %}h1{% endif %} class="archive-year" id="archive-year-{{ year }}">{{ year }} + <{%- if theme.seo %}h2{% else %}h1{%- endif %} class="archive-year" id="archive-year-{{ year }}">{{ year }}
    - {% endif %} + {%- endif %} {# endshow #} {{ post_template.render(post) }} - {% endfor %} + {%- endfor %}
    diff --git a/layout/category.swig b/layout/category.swig index f85dbf508f..979c591512 100644 --- a/layout/category.swig +++ b/layout/category.swig @@ -13,15 +13,15 @@
    - <{% if theme.seo %}h2{% else %}h1{% endif %}>{# + <{%- if theme.seo %}h2{% else %}h1{%- endif %}>{# #}{{ page.category }}{# #}{{ __('title.category') }} - +
    - {% for post in page.posts %} + {%- for post in page.posts %} {{ post_template.render(post) }} - {% endfor %} + {%- endfor %}
    diff --git a/layout/index.swig b/layout/index.swig index acc4a05923..4fbfe62871 100644 --- a/layout/index.swig +++ b/layout/index.swig @@ -1,17 +1,17 @@ {% extends '_layout.swig' %} {% import '_macro/sidebar.swig' as sidebar_template %} -{% block title %}{{ title }}{% if theme.index_with_subtitle and subtitle %} - {{ subtitle }}{% endif %}{% endblock %} +{% block title %}{{ title }}{%- if theme.index_with_subtitle and subtitle %} - {{ subtitle }}{%- endif %}{% endblock %} {% block page_class %} - {% if is_home() %}page-home{% endif -%} + {%- if is_home() %}page-home{% endif -%} {% endblock %} {% block content %}
    - {% for post in page.posts %} + {%- for post in page.posts %} {{ partial('_macro/post.swig', {is_index: true}) }} - {% endfor %} + {%- endfor %}
    {% include '_partials/pagination.swig' %} diff --git a/layout/page.swig b/layout/page.swig index b2c08712cc..34b3c93756 100644 --- a/layout/page.swig +++ b/layout/page.swig @@ -2,9 +2,9 @@ {% import '_macro/sidebar.swig' as sidebar_template %} {% block title %}{# - #}{% set page_title_suffix = ' | ' + title %}{# + #}{%- set page_title_suffix = ' | ' + title %}{# - #}{% if page.type === 'categories' and not page.title %}{# + #}{%- if page.type === 'categories' and not page.title %}{# #}{{ __('title.category') + page_title_suffix }}{# #}{% elif page.type === 'tags' and not page.title %}{# #}{{ __('title.tag') + page_title_suffix }}{# @@ -12,7 +12,7 @@ #}{{ __('title.schedule') + page_title_suffix }}{# #}{% else %}{# #}{{ page.title + page_title_suffix }}{# - #}{% endif %}{# + #}{%- endif %}{# #}{% endblock %} {% block page_class %}page-post-detail{% endblock %} @@ -28,36 +28,36 @@ {#################} {### PAGE BODY ###} {#################} -
    +
    {# tagcloud page support #} - {% if page.type === 'tags' %} + {%- if page.type === 'tags' %}
    - {% set visibleTags = 0 %} - {% for tag in site.tags %} - {% if tag.length %} - {% set visibleTags += 1 %} - {% endif %} - {% endfor %} + {%- set visibleTags = 0 %} + {%- for tag in site.tags %} + {%- if tag.length %} + {%- set visibleTags += 1 %} + {%- endif %} + {%- endfor %} {{ _p('counter.tag_cloud', visibleTags) }}
    - {% if not theme.tagcloud %} + {%- if not theme.tagcloud %} {{ tagcloud({min_font: 12, max_font: 30, amount: 200, color: true, start_color: '#ccc', end_color: '#111'}) }} {% else %} {{ tagcloud({min_font: theme.tagcloud.min, max_font: theme.tagcloud.max, amount: theme.tagcloud.amount, color: true, start_color: theme.tagcloud.start, end_color: theme.tagcloud.end}) }} - {% endif %} + {%- endif %}
    {% elif page.type === 'categories' %}
    - {% set visibleCategories = 0 %} - {% for cat in site.categories %} - {% if cat.length %} - {% set visibleCategories += 1 %} - {% endif %} - {% endfor %} + {%- set visibleCategories = 0 %} + {%- for cat in site.categories %} + {%- if cat.length %} + {%- set visibleCategories += 1 %} + {%- endif %} + {%- endfor %} {{ _p('counter.categories', visibleCategories) }}
    @@ -68,7 +68,7 @@ {% include 'schedule.swig' %} {% else %} {{ page.content }} - {% endif %} + {%- endif %}
    {#####################} {### END PAGE BODY ###} diff --git a/layout/tag.swig b/layout/tag.swig index 8a7e75b544..c9871418c3 100644 --- a/layout/tag.swig +++ b/layout/tag.swig @@ -13,15 +13,15 @@
    - <{% if theme.seo %}h2{% else %}h1{% endif %}>{# + <{%- if theme.seo %}h2{% else %}h1{%- endif %}>{# #}{{ page.tag }}{# #}{{ __('title.tag') }} - +
    - {% for post in page.posts %} + {%- for post in page.posts %} {{ post_template.render(post) }} - {% endfor %} + {%- endfor %}