From 3f2c57c89fb11c76dd3121f6edf04a8663ed41f1 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sat, 6 Oct 2018 20:51:04 -0500 Subject: [PATCH] Allow override of jquery for base template --- tailbone/templates/base.mako | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tailbone/templates/base.mako b/tailbone/templates/base.mako index f4a18475..992ee681 100644 --- a/tailbone/templates/base.mako +++ b/tailbone/templates/base.mako @@ -147,8 +147,7 @@ <%def name="core_javascript()"> - ${h.javascript_link('https://code.jquery.com/jquery-1.12.4.min.js')} - ${h.javascript_link('https://code.jquery.com/ui/{}/jquery-ui.min.js'.format(request.rattail_config.get('tailbone', 'jquery_ui.version', default='1.11.4')))} + ${self.jquery()} ${h.javascript_link(request.static_url('tailbone:static/js/lib/jquery.ui.menubar.js'))} ${h.javascript_link(request.static_url('tailbone:static/js/lib/jquery.loadmask.min.js'))} ${h.javascript_link(request.static_url('tailbone:static/js/lib/jquery.ui.timepicker.js'))} @@ -162,6 +161,11 @@ ${h.javascript_link(request.static_url('tailbone:static/js/jquery.ui.tailbone.js') + '?ver={}'.format(tailbone.__version__))} +<%def name="jquery()"> + ${h.javascript_link('https://code.jquery.com/jquery-1.12.4.min.js')} + ${h.javascript_link('https://code.jquery.com/ui/{}/jquery-ui.min.js'.format(request.rattail_config.get('tailbone', 'jquery_ui.version', default='1.11.4')))} + + <%def name="extra_javascript()"> <%def name="core_styles()">