diff --git a/tailbone/templates/themes/falafel/feedback_dialog.mako b/tailbone/templates/feedback_dialog_buefy.mako similarity index 100% rename from tailbone/templates/themes/falafel/feedback_dialog.mako rename to tailbone/templates/feedback_dialog_buefy.mako diff --git a/tailbone/templates/grids/buefy.mako b/tailbone/templates/grids/buefy.mako index 2e3bc420..39984551 100644 --- a/tailbone/templates/grids/buefy.mako +++ b/tailbone/templates/grids/buefy.mako @@ -49,7 +49,7 @@
% if grid.filterable: ## TODO: stop using |n filter - ${grid.render_filters(allow_save_defaults=allow_save_defaults)|n} + ${grid.render_filters(template='/grids/filters_buefy.mako', allow_save_defaults=allow_save_defaults)|n} % endif
diff --git a/tailbone/templates/themes/falafel/grids/filters.mako b/tailbone/templates/grids/filters_buefy.mako similarity index 100% rename from tailbone/templates/themes/falafel/grids/filters.mako rename to tailbone/templates/grids/filters_buefy.mako diff --git a/tailbone/templates/themes/falafel/base.mako b/tailbone/templates/themes/falafel/base.mako index 19ba92ed..84d22dba 100644 --- a/tailbone/templates/themes/falafel/base.mako +++ b/tailbone/templates/themes/falafel/base.mako @@ -1,6 +1,6 @@ ## -*- coding: utf-8; -*- <%namespace file="/grids/nav.mako" import="grid_index_nav" /> -<%namespace file="/feedback_dialog.mako" import="feedback_dialog" /> +<%namespace file="/feedback_dialog_buefy.mako" import="feedback_dialog" /> <%namespace name="base_meta" file="/base_meta.mako" /> @@ -274,8 +274,6 @@ ## FontAwesome 5.3.1 - ## ${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/tailbone.js') + '?ver={}'.format(tailbone.__version__))} - ## ${h.javascript_link(request.static_url('tailbone:static/js/tailbone.feedback.js') + '?ver={}'.format(tailbone.__version__))} - ## ${h.javascript_link(request.static_url('tailbone:static/js/jquery.ui.tailbone.js') + '?ver={}'.format(tailbone.__version__))} <%def name="jquery()"> - ## jQuery 1.12.4 ${h.javascript_link('https://code.jquery.com/jquery-1.12.4.min.js')} - - ## jQuery 1.11.4 - ## ${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()"> - ## Bulma 0.7.4 - ${h.stylesheet_link('https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.4/css/bulma.min.css')} - - ## Buefy 0.7.4 - ${h.stylesheet_link('https://unpkg.com/buefy@0.7.4/dist/buefy.min.css')} - -## ${self.jquery_theme()} -## ${h.stylesheet_link(request.static_url('tailbone:static/css/jquery.loadmask.css'))} -## ${h.stylesheet_link(request.static_url('tailbone:static/css/jquery.ui.timepicker.css'))} -## ${h.stylesheet_link(request.static_url('tailbone:static/css/jquery.ui.tailbone.css') + '?ver={}'.format(tailbone.__version__))} + ${self.buefy_styles()} ${h.stylesheet_link(request.static_url('tailbone:static/themes/bobcat/css/base.css') + '?ver={}'.format(tailbone.__version__))} ${h.stylesheet_link(request.static_url('tailbone:static/themes/falafel/css/layout.css') + '?ver={}'.format(tailbone.__version__))} @@ -336,8 +317,9 @@ ${h.stylesheet_link(request.static_url('tailbone:static/css/diffs.css') + '?ver={}'.format(tailbone.__version__))} -<%def name="jquery_theme()"> - ${h.stylesheet_link('https://code.jquery.com/ui/1.11.4/themes/dark-hive/jquery-ui.css')} +<%def name="buefy_styles()"> + ## Buefy 0.7.4 + ${h.stylesheet_link('https://unpkg.com/buefy@0.7.4/dist/buefy.min.css')} <%def name="extra_styles()">