rattail/tailbone
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Rollback our jQuery UI version again..to 1.11.4

Browse source 
apparently the new one introduces some changes which need to be
investigated further.  This change also makes it easier to override
the core jquery script tags, for experimenation...
This commit is contained in:
Lance Edgar 2017-03-21 13:40:59 -05:00
parent abb82c91f3
commit 27c118eb10
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tailbone/templates/base.mako
View file

@ -129,7 +129,7 @@
<%def name="core_javascript()"> <%def name="core_javascript()">
${h.javascript_link('https://code.jquery.com/jquery-1.12.4.min.js')} ${h.javascript_link('https://code.jquery.com/jquery-1.12.4.min.js')}
${h.javascript_link('https://code.jquery.com/ui/1.12.1/jquery-ui.min.js')} ${h.javascript_link('https://code.jquery.com/ui/1.11.4/jquery-ui.min.js')}
${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.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.loadmask.min.js'))}
${h.javascript_link(request.static_url('tailbone:static/js/lib/jquery.ui.timepicker.js'))} ${h.javascript_link(request.static_url('tailbone:static/js/lib/jquery.ui.timepicker.js'))}

12
tailbone/templates/themes/better/base.mako
View file

@ -8,10 +8,7 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8" /> <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<title>${self.global_title()} &raquo; ${capture(self.title)|n}</title> <title>${self.global_title()} &raquo; ${capture(self.title)|n}</title>
${self.favicon()} ${self.favicon()}
${base.core_javascript()} ${self.header_core()}
${self.extra_javascript()}
${base.core_styles(jquery_theme=self.jquery_theme)}
${self.extra_styles()}
% if not request.rattail_config.production(): % if not request.rattail_config.production():
<style type="text/css"> <style type="text/css">
@ -113,6 +110,13 @@
<%def name="favicon()"></%def> <%def name="favicon()"></%def>
<%def name="header_core()">
${base.core_javascript()}
${self.extra_javascript()}
${base.core_styles(jquery_theme=self.jquery_theme)}
${self.extra_styles()}
</%def>
<%def name="jquery_theme()"> <%def name="jquery_theme()">
${h.stylesheet_link('https://code.jquery.com/ui/1.11.4/themes/dark-hive/jquery-ui.css')} ${h.stylesheet_link('https://code.jquery.com/ui/1.11.4/themes/dark-hive/jquery-ui.css')}
</%def> </%def>