Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit f83ebd5

Browse files
ralsinaralsina
committedMay 5, 2015
implemented use_cdn=True and use_bundles=False. Still some issues, like requiring webassets when not using it, maybe template error syntaes
1 parent 802258a commit f83ebd5

File tree

3 files changed

+24
-35
lines changed

3 files changed

+24
-35
lines changed
 

‎nikola/data/themes/bootstrap3-jinja/templates/base_helper.tmpl

+8-18
Original file line numberDiff line numberDiff line change
@@ -74,20 +74,14 @@ lang="{{ lang }}">
7474
{% endif %}
7575
<script src="/assets/js/all.js"></script>
7676
{% else %}
77-
{% if use_cdn %}
78-
FOO
79-
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
80-
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
81-
{% else %}
82-
<script src="/assets/js/jquery.min.js"></script>
83-
<script src="/assets/js/bootstrap.min.js"></script>
84-
<script src="/assets/js/moment-with-locales.min.js"></script>
85-
<script src="/assets/js/fancydates.js"></script>
86-
{% endif %}
87-
<script src="/assets/js/jquery.colorbox-min.js"></script>
77+
<script src="{{ cdn_url('jquery', use_cdn, '/assets/js/jquery.min.js') }}"></script>
78+
<script src="{{ cdn_url('twitter-bootstrap', use_cdn, '/assets/js/bootstrap.min.js') }}"></script>
79+
<script src="{{ cdn_url('moment.js::moment-with-locales.min.js', use_cdn, '/assets/js/moment-with-locales.min.js') }}"></script>
80+
<script src="{{ cdn_url('fancydates.js', use_cdn, '/assets/js/fancydates.js') }}"></script>
81+
<script src="{{ cdn_url('jquery.colorbox', use_cdn, '/assets/js/jquery.colorbox-min.js') }}"></script>
8882
{% endif %}
8983
{% if colorbox_locales[lang] %}
90-
<script src="/assets/js/colorbox-i18n/jquery.colorbox-{{ colorbox_locales[lang] }}.js"></script>
84+
<script src="{{ cdn_url('jquery.colorbox::i18n/jquery.colorbox-${colorbox_locales[lang] }}.js', use_cdn, '/assets/js/colorbox-i18n/jquery.colorbox-{{ colorbox_locales[lang] }}.js')}"></script>
9185
{% endif %}
9286
{{ social_buttons_code }}
9387
{% endmacro %}
@@ -102,14 +96,10 @@ lang="{{ lang }}">
10296
{% endif %}
10397
<link href="/assets/css/all.css" rel="stylesheet" type="text/css">
10498
{% else %}
105-
{% if use_cdn %}
106-
- <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" rel="stylesheet">
107-
{% else %}
108-
<link href="/assets/css/bootstrap.min.css" rel="stylesheet" type="text/css">
109-
{% endif %}
99+
- <link href="{{ cdn_url('twitter-bootstrap::bootstrap.css', use_cdn, '/assets/css/bootstrap.min.css') }}" rel="stylesheet" type="text/css">
110100
<link href="/assets/css/rst.css" rel="stylesheet" type="text/css">
111101
<link href="/assets/css/code.css" rel="stylesheet" type="text/css">
112-
<link href="/assets/css/colorbox.css" rel="stylesheet" type="text/css">
102+
- <link href="{{ cdn_url('jquery.colorbox::colorbox.css', use_cdn, '/assets/css/colorbox.css') }}" rel="stylesheet" type="text/css">
113103
<link href="/assets/css/theme.css" rel="stylesheet" type="text/css">
114104
{% if has_custom_css %}
115105
<link href="/assets/css/custom.css" rel="stylesheet" type="text/css">

‎nikola/data/themes/bootstrap3/templates/base_helper.tmpl

+8-17
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,14 @@ lang="${lang}">
7474
%endif
7575
<script src="/assets/js/all.js"></script>
7676
%else:
77-
%if use_cdn:
78-
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
79-
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
80-
%else:
81-
<script src="/assets/js/jquery.min.js"></script>
82-
<script src="/assets/js/bootstrap.min.js"></script>
83-
<script src="/assets/js/moment-with-locales.min.js"></script>
84-
<script src="/assets/js/fancydates.js"></script>
85-
%endif
86-
<script src="/assets/js/jquery.colorbox-min.js"></script>
77+
<script src="${cdn_url('jquery', use_cdn, '/assets/js/jquery.min.js')}"></script>
78+
<script src="${cdn_url('twitter-bootstrap', use_cdn, '/assets/js/bootstrap.min.js')}"></script>
79+
<script src="${cdn_url('moment.js::moment-with-locales.min.js', use_cdn, '/assets/js/moment-with-locales.min.js')}"></script>
80+
<script src="${cdn_url('fancydates.js', use_cdn, '/assets/js/fancydates.js')}"></script>
81+
<script src="${cdn_url('jquery.colorbox', use_cdn, '/assets/js/jquery.colorbox-min.js')}"></script>
8782
%endif
8883
%if colorbox_locales[lang]:
89-
<script src="/assets/js/colorbox-i18n/jquery.colorbox-${colorbox_locales[lang]}.js"></script>
84+
<script src="${cdn_url('jquery.colorbox::i18n/jquery.colorbox-${colorbox_locales[lang]}.js', use_cdn, '/assets/js/colorbox-i18n/jquery.colorbox-${colorbox_locales[lang]}.js')}"></script>
9085
%endif
9186
${social_buttons_code}
9287
</%def>
@@ -101,14 +96,10 @@ lang="${lang}">
10196
%endif
10297
<link href="/assets/css/all.css" rel="stylesheet" type="text/css">
10398
%else:
104-
%if use_cdn:
105-
- <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" rel="stylesheet">
106-
%else:
107-
<link href="/assets/css/bootstrap.min.css" rel="stylesheet" type="text/css">
108-
%endif
99+
- <link href="${cdn_url('twitter-bootstrap::bootstrap.css', use_cdn, '/assets/css/bootstrap.min.css')}" rel="stylesheet" type="text/css">
109100
<link href="/assets/css/rst.css" rel="stylesheet" type="text/css">
110101
<link href="/assets/css/code.css" rel="stylesheet" type="text/css">
111-
<link href="/assets/css/colorbox.css" rel="stylesheet" type="text/css">
102+
- <link href="${cdn_url('jquery.colorbox::colorbox.css', use_cdn, '/assets/css/colorbox.css')}" rel="stylesheet" type="text/css">
112103
<link href="/assets/css/theme.css" rel="stylesheet" type="text/css">
113104
%if has_custom_css:
114105
<link href="/assets/css/custom.css" rel="stylesheet" type="text/css">

‎nikola/plugins/task/bundles.py

+8
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,14 @@ def set_site(self, site):
5656
self.cdn_css_urls = []
5757
super(BuildBundles, self).set_site(site)
5858
self.inject_dependency('render_pages', 'create_bundles')
59+
self.site.GLOBAL_CONTEXT['cdn_url'] = self.local_or_cdn_url_from_entry
60+
61+
def local_or_cdn_url_from_entry(self, entry, use_cdn, default):
62+
"""Given a JS or CSS entry, returns a URL. Returns default if use_cdn is False."""
63+
url = self.url_from_entry(entry)
64+
if url is None:
65+
return default
66+
return url
5967

6068
def url_from_entry(self, entry):
6169
"""Turn a bundles entry into a URL from cdnjs"""

0 commit comments

Comments
 (0)
Please sign in to comment.