diff --git a/languages/en.yml b/languages/en.yml index ce21ac512c..12b126af00 100644 --- a/languages/en.yml +++ b/languages/en.yml @@ -30,7 +30,6 @@ post: read_more: Read more untitled: Untitled sticky: Sticky - toc_empty: This post does not have a Table of Contents views: Views related_posts: Related Posts copy_button: Copy diff --git a/layout/_layout.swig b/layout/_layout.swig index 9bc868decb..12106ae9ce 100644 --- a/layout/_layout.swig +++ b/layout/_layout.swig @@ -13,36 +13,25 @@ {%- set pjax = ' pjax' %} {%- 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' %} {{- next_inject('head') }} {% block title %}{% endblock %} - {% include '_third-party/analytics/index.swig' %} + {{ partial('_third-party/analytics/index.swig', {}, {cache: theme.cache.enable}) }} {{ partial('_scripts/noscript.swig', {}, {cache: theme.cache.enable}) }} -
+
- {%- if theme.bookmark.enable %} - - {%- endif %} - - {{ partial('_partials/github-banner.swig', {}, {cache: theme.cache.enable}) }} -
@@ -68,18 +57,7 @@
- {%- if theme.back2top.enable and not theme.back2top.sidebar %} -
- - 0% -
- {%- endif %} - - {%- if theme.reading_progress.enable %} -
- {%- endif %} - - {{ partial('_partials/share.swig', {}, {cache: theme.cache.enable}) }} + {{ partial('_partials/widgets.swig', {}, {cache: theme.cache.enable}) }}
{{ partial('_scripts/index.swig', {}, {cache: theme.cache.enable}) }} @@ -99,7 +77,7 @@ {%- if theme.pjax %}
- {% include '_partials/pjax.swig' %} + {{ partial('_scripts/pjax.swig', {}, {cache: theme.cache.enable}) }} {%- endif %} diff --git a/layout/_macro/sidebar.swig b/layout/_macro/sidebar.swig index 487086a2b6..dc0c42444d 100644 --- a/layout/_macro/sidebar.swig +++ b/layout/_macro/sidebar.swig @@ -11,50 +11,39 @@
{%- set display_toc = theme.toc.enable and display_toc %} - - {%- if display_toc and toc(page.content).length > 1 %} - + {%- if display_toc %} + {%- set next_toc_number = page.toc_number | default(theme.toc.number) %} + {%- set next_toc_max_depth = page.toc_max_depth | default(theme.toc.max_depth) | default(6) %} + {%- set toc = toc(page.content, { "class": "nav", list_number: next_toc_number, max_depth: next_toc_max_depth }) %} + {%- set display_toc = toc.length > 1 and display_toc %} {%- endif %} -
-
- - {{ partial('_partials/sidebar/site-overview.swig', {}, {cache: theme.cache.enable}) }} - - {{- next_inject('sidebar') }} +
    +
  • + {{ __('sidebar.toc') }} +
    • +
  • + {{ __('sidebar.overview') }} +
    • +
-
-
- - {%- if display_toc and toc(page.content).length > 1 %} -
+
+ {%- if display_toc %}
+
{{ toc }}
+
+ {%- endif %} +
+ - {%- set next_toc_number = theme.toc.number %} - {%- if page.toc_number !== undefined %} - {%- set next_toc_number = page.toc_number %} - {%- endif %} - {%- set next_toc_max_depth = page.toc_max_depth|default(theme.toc.max_depth)|default(6) %} - {%- set toc = toc(page.content, { "class": "nav", list_number: next_toc_number, max_depth: next_toc_max_depth }) %} - - {%- if toc.length <= 1 %} -

{{ __('post.toc_empty') }}

- {% else %} -
{{ toc }}
- {%- endif %} +
+
+ {{ partial('_partials/sidebar/site-overview.swig', {}, {cache: theme.cache.enable}) }} -
+ {{- next_inject('sidebar') }}
- - {%- endif %} +
{%- if theme.back2top.enable and theme.back2top.sidebar %}
diff --git a/layout/_third-party/analytics/firestore.swig b/layout/_partials/analytics/firestore.swig similarity index 100% rename from layout/_third-party/analytics/firestore.swig rename to layout/_partials/analytics/firestore.swig diff --git a/layout/_partials/analytics/index.swig b/layout/_partials/analytics/index.swig index a318651a17..1099da2930 100644 --- a/layout/_partials/analytics/index.swig +++ b/layout/_partials/analytics/index.swig @@ -1,4 +1,6 @@ {% include 'busuanzi-counter.swig' %} {% include 'cnzz-analytics.swig' %} +{% include 'firestore.swig' %} +{% include 'lean-analytics.swig' %} {% include 'tencent-analytics.swig' %} {% include 'tencent-mta.swig' %} diff --git a/layout/_third-party/analytics/lean-analytics.swig b/layout/_partials/analytics/lean-analytics.swig similarity index 100% rename from layout/_third-party/analytics/lean-analytics.swig rename to layout/_partials/analytics/lean-analytics.swig diff --git a/layout/_partials/share.swig b/layout/_partials/share.swig deleted file mode 100644 index d296af361f..0000000000 --- a/layout/_partials/share.swig +++ /dev/null @@ -1,5 +0,0 @@ -{%- if theme.add_this_id %} -
- -
-{%- endif %} diff --git a/layout/_partials/github-banner.swig b/layout/_partials/widgets.swig similarity index 69% rename from layout/_partials/github-banner.swig rename to layout/_partials/widgets.swig index 4446fdd78a..fcd9aaf5d2 100644 --- a/layout/_partials/github-banner.swig +++ b/layout/_partials/widgets.swig @@ -1,3 +1,15 @@ +{%- if theme.back2top.enable and not theme.back2top.sidebar %} +
+ + 0% +
+{%- endif %} +{%- if theme.reading_progress.enable %} +
+{%- endif %} +{%- if theme.bookmark.enable %} + +{%- endif %} {%- if theme.github_banner.enable %} {%- set github_URL = theme.github_banner.permalink %} {%- set github_title = theme.github_banner.title %} @@ -6,3 +18,8 @@ {{ next_url(github_URL, github_image, {class: 'github-corner', title: github_title, "aria-label": github_title}) }} {%- endif %} +{%- if theme.add_this_id %} +
+ +
+{%- endif %} diff --git a/layout/_scripts/pages/post-details.swig b/layout/_scripts/pages/post-details.swig index a77f5b1fa5..cb699c264f 100644 --- a/layout/_scripts/pages/post-details.swig +++ b/layout/_scripts/pages/post-details.swig @@ -1 +1 @@ -{{- next_js('scrollspy.js', 'post-details.js') }} +{{- next_js('post-details.js') }} diff --git a/layout/_partials/pjax.swig b/layout/_scripts/pjax.swig similarity index 70% rename from layout/_partials/pjax.swig rename to layout/_scripts/pjax.swig index a3f4e0b652..4803e83f57 100644 --- a/layout/_partials/pjax.swig +++ b/layout/_scripts/pjax.swig @@ -4,19 +4,13 @@ var pjax = new Pjax({ 'head title', '#page-configurations', '.content-wrap', - '.sidebar-inner', + '.post-toc-wrap', '#pjax' ], - switches: { - '.sidebar-inner': Pjax.switches.innerHTML - }, analytics: false, cacheBust: false, scrollTo: !CONFIG.bookmark.enable }); -window.addEventListener('pjax:send', () => { - $('.sidebar-inner').stop().fadeTo('fast', 0); -}); window.addEventListener('pjax:success', () => { document.querySelectorAll('script[pjax], script#page-configurations, #pjax script').forEach(element => { $(element).parent().append($(element).remove()); @@ -28,8 +22,6 @@ window.addEventListener('pjax:success', () => { .add(NexT.motion.middleWares.postList) .bootstrap(); } - $('.sidebar-inner .motion-element').css('opacity', 1); - $('.sidebar-inner').fadeTo('fast', 1); NexT.utils.updateSidebarPosition(); }); diff --git a/layout/_third-party/analytics/analytics-with-jquery.swig b/layout/_third-party/analytics/analytics-with-jquery.swig deleted file mode 100644 index aa92411e85..0000000000 --- a/layout/_third-party/analytics/analytics-with-jquery.swig +++ /dev/null @@ -1,2 +0,0 @@ -{% include 'lean-analytics.swig' %} -{% include 'firestore.swig' %} diff --git a/layout/_third-party/index.swig b/layout/_third-party/index.swig index 6f6d24b777..356c352773 100644 --- a/layout/_third-party/index.swig +++ b/layout/_third-party/index.swig @@ -1,6 +1,5 @@ {% include 'baidu-push.swig' %} -{% include 'analytics/analytics-with-jquery.swig' %} {% include 'facebook-sdk.swig' %} {% include 'rating.swig' %} diff --git a/layout/_third-party/quicklink.swig b/layout/_third-party/quicklink.swig index 6fb5d862a4..755f0d3600 100644 --- a/layout/_third-party/quicklink.swig +++ b/layout/_third-party/quicklink.swig @@ -12,7 +12,7 @@ {%- set loadQL = true %} {%- endif %} {%- endif %} - + {%- if loadQL or (page.quicklink or post.quicklink) %}