Clean up falafel theme, move some parts to root template path

This commit is contained in:
Lance Edgar 2019-05-07 21:10:48 -05:00
parent 6ef217c546
commit 3cb803ffe3
4 changed files with 6 additions and 24 deletions

View file

@ -49,7 +49,7 @@
<div class="filters"> <div class="filters">
% if grid.filterable: % if grid.filterable:
## TODO: stop using |n filter ## 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 % endif
</div> </div>
</div> </div>

View file

@ -1,6 +1,6 @@
## -*- coding: utf-8; -*- ## -*- coding: utf-8; -*-
<%namespace file="/grids/nav.mako" import="grid_index_nav" /> <%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" /> <%namespace name="base_meta" file="/base_meta.mako" />
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
@ -274,8 +274,6 @@
## FontAwesome 5.3.1 ## FontAwesome 5.3.1
<script defer src="https://use.fontawesome.com/releases/v5.3.1/js/all.js"></script> <script defer src="https://use.fontawesome.com/releases/v5.3.1/js/all.js"></script>
## ${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'))}
<script type="text/javascript"> <script type="text/javascript">
var session_timeout = ${request.get_session_timeout() or 'null'}; var session_timeout = ${request.get_session_timeout() or 'null'};
var logout_url = '${request.route_url('logout')}'; var logout_url = '${request.route_url('logout')}';
@ -296,35 +294,18 @@
}); });
}); });
</script> </script>
## ${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> </%def>
<%def name="jquery()"> <%def name="jquery()">
## jQuery 1.12.4 ## jQuery 1.12.4
${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')}
## 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> </%def>
<%def name="extra_javascript()"></%def> <%def name="extra_javascript()"></%def>
<%def name="core_styles()"> <%def name="core_styles()">
## Bulma 0.7.4 ${self.buefy_styles()}
${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__))}
${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/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__))} ${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__))} ${h.stylesheet_link(request.static_url('tailbone:static/css/diffs.css') + '?ver={}'.format(tailbone.__version__))}
</%def> </%def>
<%def name="jquery_theme()"> <%def name="buefy_styles()">
${h.stylesheet_link('https://code.jquery.com/ui/1.11.4/themes/dark-hive/jquery-ui.css')} ## Buefy 0.7.4
${h.stylesheet_link('https://unpkg.com/buefy@0.7.4/dist/buefy.min.css')}
</%def> </%def>
<%def name="extra_styles()"></%def> <%def name="extra_styles()"></%def>