Rename custom user_css
context
and stop checking an older deprecated setting
This commit is contained in:
parent
d0d568b3a5
commit
52c8f3e12c
|
@ -183,9 +183,7 @@ def before_render(event):
|
||||||
if request.user:
|
if request.user:
|
||||||
css = request.rattail_config.get('tailbone.{}'.format(request.user.uuid),
|
css = request.rattail_config.get('tailbone.{}'.format(request.user.uuid),
|
||||||
'buefy_css')
|
'buefy_css')
|
||||||
if not css:
|
renderer_globals['user_css'] = css
|
||||||
css = request.rattail_config.get('tailbone', 'theme.falafel.buefy_css')
|
|
||||||
renderer_globals['buefy_css'] = css
|
|
||||||
|
|
||||||
# add global search data for quick access
|
# add global search data for quick access
|
||||||
renderer_globals['global_search_data'] = get_global_search_options(request)
|
renderer_globals['global_search_data'] = get_global_search_options(request)
|
||||||
|
|
|
@ -162,9 +162,8 @@
|
||||||
</%def>
|
</%def>
|
||||||
|
|
||||||
<%def name="buefy_styles()">
|
<%def name="buefy_styles()">
|
||||||
% if buefy_css:
|
% if user_css:
|
||||||
## custom Buefy CSS
|
${h.stylesheet_link(user_css)}
|
||||||
${h.stylesheet_link(buefy_css)}
|
|
||||||
% else:
|
% else:
|
||||||
## upstream Buefy CSS
|
## upstream Buefy CSS
|
||||||
${h.stylesheet_link(h.get_liburl(request, 'buefy.css'))}
|
${h.stylesheet_link(h.get_liburl(request, 'buefy.css'))}
|
||||||
|
|
|
@ -241,7 +241,7 @@ class MessageView(MasterView):
|
||||||
f.insert_after('recipients', 'set_recipients')
|
f.insert_after('recipients', 'set_recipients')
|
||||||
f.remove('recipients')
|
f.remove('recipients')
|
||||||
f.set_node('set_recipients', colander.SchemaNode(colander.Set()))
|
f.set_node('set_recipients', colander.SchemaNode(colander.Set()))
|
||||||
f.set_widget('set_recipients', RecipientsWidgetBuefy())
|
f.set_widget('set_recipients', RecipientsWidget())
|
||||||
f.set_label('set_recipients', "To")
|
f.set_label('set_recipients', "To")
|
||||||
|
|
||||||
if self.replying:
|
if self.replying:
|
||||||
|
@ -514,7 +514,7 @@ class SentView(MessageView):
|
||||||
default_active=True, default_verb='contains')
|
default_active=True, default_verb='contains')
|
||||||
|
|
||||||
|
|
||||||
class RecipientsWidgetBuefy(dfwidget.Widget):
|
class RecipientsWidget(dfwidget.Widget):
|
||||||
"""
|
"""
|
||||||
Custom "message recipients" widget, for use with Vue.js themes.
|
Custom "message recipients" widget, for use with Vue.js themes.
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in a new issue