Skip to content

Need more cache 2 #1051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stevenjoezhang merged 2 commits into from
Aug 3, 2019
Merged

Need more cache 2 #1051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f693b6e
Need more cache 2
stevenjoezhang Aug 3, 2019
692c427
Update
stevenjoezhang Aug 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions layout/_layout.swig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<footer id="footer" class="footer">
<div class="footer-inner">
{{ partial('_partials/footer.swig', {}, {cache: theme.cache.enable}) }}
{% include '_partials/analytics/index.swig' %}
{{ partial('_partials/analytics/index.swig', {}, {cache: theme.cache.enable}) }}
{% block footer %}{% endblock %}
</div>
</footer>
Expand All @@ -80,20 +80,11 @@
</div>
{%- endif %}

{% include '_partials/share/index.swig' %}
{{ partial('_partials/share/index.swig', {}, {cache: theme.cache.enable}) }}
</div>

{% include '_scripts/vendors.swig' %}
{% include '_scripts/commons.swig' %}

{%- set scheme_script = '_scripts/schemes/' + theme.scheme | lower + '.swig' %}
{% include scheme_script %}

{% include '_scripts/next-boot.swig' %}
{% include '_scripts/exturl.swig' %}
{% include '_scripts/three.swig' %}

{% include '_third-party/index.swig' %}
{{ partial('_scripts/index.swig', {}, {cache: theme.cache.enable}) }}
{{ partial('_third-party/index.swig', {}, {cache: theme.cache.enable}) }}

{%- if theme.pjax %}
<div id="pjax">
Expand Down
15 changes: 14 additions & 1 deletion layout/_partials/header/index.swig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
{{ partial('_partials/header/brand.swig', {}, {cache: theme.cache.enable}) }}
{% include 'menu.swig' %}

<nav class="site-nav">
{{ partial('_partials/header/menu.swig', {}, {cache: theme.cache.enable}) }}

{%- if theme.scheme === 'Muse' || theme.scheme === 'Mist' %}
{% include 'sub-menu.swig' %}
{%- endif %}

{%- if hasSearch %}
<div class="site-search">
{{ partial('_partials/search/index.swig', {}, {cache: theme.cache.enable}) }}
</div>
{%- endif %}
</nav>

{%- for inject_item in theme.injects.header %}
{{ partial(inject_item.layout, inject_item.locals, inject_item.options) }}
Expand Down
78 changes: 33 additions & 45 deletions layout/_partials/header/menu.swig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,36 @@
{% import '../../_macro/menu/menu-item.swig' as menu_item %}

<nav class="site-nav">
{%- if theme.menu %}
<ul id="menu" class="menu">
{%- for name, path in theme.menu %}
{%- set respath = path %}
{%- if path == '[object Object]' %}
{# Main Menu (default menu item for Submenu) #}
{%- for subname, subpath in path %}
{%- set itemName = subname.toLowerCase() %}
{%- set respath = subpath %}
{%- if itemName == 'default' %}
{%- set itemName = name.toLowerCase() %}
{{ menu_item.render(name, respath) }}
{%- endif %}
{%- endfor %}
{% else %}
{# Main Menu (standart menu items) #}
{%- set itemName = name.toLowerCase() %}
{{- menu_item.render(name, respath) | trim -}}
{%- endif -%}
{%- endfor %}
{%- if theme.menu %}
<ul id="menu" class="menu">
{%- for name, path in theme.menu %}
{%- set respath = path %}
{%- if path == '[object Object]' %}
{# Main Menu (default menu item for Submenu) #}
{%- for subname, subpath in path %}
{%- set itemName = subname.toLowerCase() %}
{%- set respath = subpath %}
{%- if itemName == 'default' %}
{%- set itemName = name.toLowerCase() %}
{{ menu_item.render(name, respath) }}
{%- endif %}
{%- endfor %}
{% else %}
{# Main Menu (standart menu items) #}
{%- set itemName = name.toLowerCase() %}
{{- menu_item.render(name, respath) | trim -}}
{%- endif -%}
{%- endfor %}

{%- set hasSearch = theme.algolia_search.enable || theme.local_search.enable %}
{%- if hasSearch %}
<li class="menu-item menu-item-search">
<a href="javascript:;" class="popup-trigger">
{%- if theme.menu_settings.icons %}
<i class="menu-item-icon fa fa-search fa-fw"></i> <br>{#
#}{%- endif %}{#
#}{{ __('menu.search') }}{#
#}</a>
</li>
{%- endif %}
</ul>
{%- endif %}

{%- if theme.scheme === 'Muse' || theme.scheme === 'Mist' %}
{% include 'sub-menu.swig' %}
{%- endif %}

{%- if hasSearch %}
<div class="site-search">
{% include '../search/index.swig' %}
</div>
{%- endif %}
</nav>
{%- set hasSearch = theme.algolia_search.enable || theme.local_search.enable %}
{%- if hasSearch %}
<li class="menu-item menu-item-search">
<a href="javascript:;" class="popup-trigger">
{%- if theme.menu_settings.icons %}
<i class="menu-item-icon fa fa-search fa-fw"></i> <br>{#
#}{%- endif %}{#
#}{{ __('menu.search') }}{#
#}</a>
</li>
{%- endif %}
</ul>
{%- endif %}
9 changes: 9 additions & 0 deletions layout/_scripts/index.swig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{% include 'vendors.swig' %}
{% include 'commons.swig' %}

{%- set scheme_script = 'schemes/' + theme.scheme | lower + '.swig' %}
{% include scheme_script %}

{% include 'next-boot.swig' %}
{% include 'exturl.swig' %}
{% include 'three.swig' %}