From 6d846ab0dbf29f47983eb32cb3e574f4a7e233c1 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sat, 3 Aug 2019 19:20:42 -0500 Subject: [PATCH] Bring all of header into WholePage component now there is only *one* Vue.js app instantiated on each page, yay! --- tailbone/templates/themes/falafel/base.mako | 476 +++++++++++--------- 1 file changed, 273 insertions(+), 203 deletions(-) diff --git a/tailbone/templates/themes/falafel/base.mako b/tailbone/templates/themes/falafel/base.mako index 7f746362..93c3d5ba 100644 --- a/tailbone/templates/themes/falafel/base.mako +++ b/tailbone/templates/themes/falafel/base.mako @@ -1,6 +1,5 @@ ## -*- coding: utf-8; -*- <%namespace file="/grids/nav.mako" import="grid_index_nav" /> -<%namespace file="/feedback_dialog_buefy.mako" import="feedback_dialog" /> <%namespace file="/autocomplete.mako" import="tailbone_autocomplete_template" /> <%namespace name="base_meta" file="/base_meta.mako" /> @@ -31,185 +30,6 @@ - - ## TODO: should move template to JS, then can postpone the JS - ${tailbone_autocomplete_template()} - ${h.javascript_link(request.static_url('tailbone:static/js/tailbone.buefy.autocomplete.js') + '?ver={}'.format(tailbone.__version__))} - -
- - - - -
- ${self.body()}
@@ -219,7 +39,6 @@ ${self.render_whole_page_template()} ${self.make_whole_page_component()} ${self.make_whole_page_app()} - @@ -268,20 +87,6 @@ var session_timeout = ${request.get_session_timeout() or 'null'}; var logout_url = '${request.route_url('logout')}'; var noop_url = '${request.route_url('noop')}'; - % if expose_db_picker is not Undefined and expose_db_picker: - $(function() { - $('#db-picker').change(function() { - $(this).parents('form:first').submit(); - }); - }); - % endif - % if expose_theme_picker and request.has_perm('common.change_app_theme'): - $(function() { - $('#theme-picker').change(function() { - $(this).parents('form:first').submit(); - }); - }); - % endif $(function() { ## NOTE: this code was copied from ## https://bulma.io/documentation/components/navbar/#navbar-menu @@ -364,6 +169,173 @@ <%def name="render_whole_page_template()"> + + + + ${tailbone_autocomplete_template()} <%def name="declare_whole_page_vars()"> + ${h.javascript_link(request.static_url('tailbone:static/themes/falafel/js/tailbone.feedback.js') + '?ver={}'.format(tailbone.__version__))} <%def name="finalize_whole_page_vars()"> @@ -462,8 +526,14 @@ ${self.modify_whole_page_vars()} ${self.finalize_whole_page_vars()} + ${h.javascript_link(request.static_url('tailbone:static/js/tailbone.buefy.autocomplete.js') + '?ver={}'.format(tailbone.__version__))} +