Skip to content

Commit

Permalink
Improve baguetteBox usage (location/CDN)
Browse files Browse the repository at this point in the history 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
  • Loading branch information
@Kwpolska
Kwpolska committed Dec 31, 2017
1 parent df7207c commit 10c84de
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 14 deletions.
5 changes: 0 additions & 5 deletions nikola/data/themes/bootstrap3-jinja/templates/base.tmpl
View file
Expand Up @@ -75,11 +75,6 @@
</div>

{{ base.late_load_js() }}
{% if use_cdn %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.8.2/baguetteBox.min.js"></script>
{% else %}
<script src="/assets/js/baguetteBox.min.js"></script>
{% endif %}
<!-- fancy dates -->
<script>
moment.locale("{{ momentjs_locales[lang] }}");
Expand Down
6 changes: 5 additions & 1 deletion nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl
View file
Expand Up @@ -79,6 +79,7 @@ lang="{{ lang }}">
{% if use_cdn %}
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.3/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.8.2/baguetteBox.min.js"></script>

<script src="/assets/js/all.js"></script>
{% else %}
Expand All @@ -88,9 +89,11 @@ lang="{{ lang }}">
{% if use_cdn %}
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.3/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.8.2/baguetteBox.min.js"></script>
{% else %}
<script src="/assets/js/jquery.min.js"></script>
<script src="/assets/js/bootstrap.min.js"></script>
<script src="/assets/js/baguetteBox.min.js"></script>
<script src="/assets/js/moment-with-locales.min.js"></script>
<script src="/assets/js/fancydates.js"></script>
{% endif %}
Expand All @@ -103,6 +106,7 @@ lang="{{ lang }}">
{% if use_bundles %}
{% if use_cdn %}
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<link href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.8.2/baguetteBox.min.css" rel="stylesheet" type="text/css">
<link href="/assets/css/all.css" rel="stylesheet" type="text/css">
{% else %}
<link href="/assets/css/all-nocdn.css" rel="stylesheet" type="text/css">
Expand All @@ -113,8 +117,8 @@ lang="{{ lang }}">
<link href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.8.2/baguetteBox.min.css" rel="stylesheet" type="text/css">
{% else %}
<link href="/assets/css/bootstrap.min.css" rel="stylesheet" type="text/css">
<link href="/assets/css/baguetteBox.min.css" rel="stylesheet" type="text/css">
{% endif %}
<link href="/assets/css/baguetteBox.min.css" rel="stylesheet" type="text/css">
<link href="/assets/css/rst_base.css" rel="stylesheet" type="text/css">
<link href="/assets/css/nikola_rst.css" rel="stylesheet" type="text/css">
<link href="/assets/css/code.css" rel="stylesheet" type="text/css">
Expand Down
4 changes: 2 additions & 2 deletions nikola/data/themes/bootstrap3/bundles
View file
@@ -1,4 +1,4 @@
assets/css/all-nocdn.css=bootstrap.min.css,rst_base.css,nikola_rst.css,code.css,baguetteBox.min.css,theme.css,custom.css
assets/css/all.css=rst_base.css,nikola_rst.css,code.css,baguetteBox.min.css,theme.css,custom.css
assets/css/all.css=rst_base.css,nikola_rst.css,code.css,theme.css,custom.css
assets/js/all-nocdn.js=jquery.min.js,bootstrap.min.js,baguetteBox.min.js,moment-with-locales.min.js,fancydates.js
assets/js/all.js=baguetteBox.min.js,moment-with-locales.min.js,fancydates.js
assets/js/all.js=moment-with-locales.min.js,fancydates.js
5 changes: 0 additions & 5 deletions nikola/data/themes/bootstrap3/templates/base.tmpl
View file
Expand Up @@ -75,11 +75,6 @@ ${template_hooks['extra_head']()}
</div>

${base.late_load_js()}
% if use_cdn:
<script src="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.8.2/baguetteBox.min.js"></script>
% else:
<script src="/assets/js/baguetteBox.min.js"></script>
% endif
<!-- fancy dates -->
<script>
moment.locale("${momentjs_locales[lang]}");
Expand Down
6 changes: 5 additions & 1 deletion nikola/data/themes/bootstrap3/templates/base_helper.tmpl
View file
Expand Up @@ -79,6 +79,7 @@ lang="${lang}">
%if use_cdn:
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.3/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.8.2/baguetteBox.min.js"></script>

<script src="/assets/js/all.js"></script>
%else:
Expand All @@ -88,9 +89,11 @@ lang="${lang}">
%if use_cdn:
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.3/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.8.2/baguetteBox.min.js"></script>
%else:
<script src="/assets/js/jquery.min.js"></script>
<script src="/assets/js/bootstrap.min.js"></script>
<script src="/assets/js/baguetteBox.min.js"></script>
<script src="/assets/js/moment-with-locales.min.js"></script>
<script src="/assets/js/fancydates.js"></script>
%endif
Expand All @@ -103,6 +106,7 @@ lang="${lang}">
%if use_bundles:
%if use_cdn:
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<link href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.8.2/baguetteBox.min.css" rel="stylesheet" type="text/css">
<link href="/assets/css/all.css" rel="stylesheet" type="text/css">
%else:
<link href="/assets/css/all-nocdn.css" rel="stylesheet" type="text/css">
Expand All @@ -113,8 +117,8 @@ lang="${lang}">
<link href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.8.2/baguetteBox.min.css" rel="stylesheet" type="text/css">
%else:
<link href="/assets/css/bootstrap.min.css" rel="stylesheet" type="text/css">
<link href="/assets/css/baguetteBox.min.css" rel="stylesheet" type="text/css">
%endif
<link href="/assets/css/baguetteBox.min.css" rel="stylesheet" type="text/css">
<link href="/assets/css/rst_base.css" rel="stylesheet" type="text/css">
<link href="/assets/css/nikola_rst.css" rel="stylesheet" type="text/css">
<link href="/assets/css/code.css" rel="stylesheet" type="text/css">
Expand Down

0 comments on commit 10c84de

Please sign in to comment.