{%if title%}{{title}} – {%endif%}FoodTruck

# HG changeset patch # User Ludovic Chabant # Date 1507403764 25200 # Node ID b1a00c2c0c7f79f2d768342754f32f876ccabcb7 # Parent 8101692fdc118ddb2726f7cae39e0bfc9c8444ad admin: Use URL routes for static assets. This removes the need for `base_url` and other workarounds for when the admin panel is under a sub-folder. diff -r 8101692fdc11 -r b1a00c2c0c7f piecrust/admin/templates/layouts/default.html --- a/piecrust/admin/templates/layouts/default.html Sat Oct 07 12:13:57 2017 -0700 +++ b/piecrust/admin/templates/layouts/default.html Sat Oct 07 12:16:04 2017 -0700 @@ -8,7 +8,7 @@

FoodTruck

{% include 'layouts/menu.html' %} diff -r 8101692fdc11 -r b1a00c2c0c7f piecrust/admin/templates/layouts/master.html --- a/piecrust/admin/templates/layouts/master.html Sat Oct 07 12:13:57 2017 -0700 +++ b/piecrust/admin/templates/layouts/master.html Sat Oct 07 12:16:04 2017 -0700 @@ -6,9 +6,9 @@ {%if title%}{{title}} – {%endif%}FoodTruck - + - +

@@ -37,7 +37,7 @@ and many more.

- + diff -r 8101692fdc11 -r b1a00c2c0c7f piecrust/admin/views/__init__.py --- a/piecrust/admin/views/__init__.py Sat Oct 07 12:13:57 2017 -0700 +++ b/piecrust/admin/views/__init__.py Sat Oct 07 12:16:04 2017 -0700 @@ -24,14 +24,4 @@ if context is None: context = {} context['menu'] = get_menu_context() - with_base_data(context) return context - - -def with_base_data(context=None): - if context is None: - context = {} - - script_root = request.script_root or '' - root_url = current_app.config.get('FOODTRUCK_ROOT_URL') or '' - context['base_url'] = script_root + root_url diff -r 8101692fdc11 -r b1a00c2c0c7f piecrust/admin/views/dashboard.py --- a/piecrust/admin/views/dashboard.py Sat Oct 07 12:13:57 2017 -0700 +++ b/piecrust/admin/views/dashboard.py Sat Oct 07 12:16:04 2017 -0700 @@ -10,7 +10,7 @@ from piecrust.uriutil import split_uri from ..textutil import text_preview from ..blueprint import foodtruck_bp, load_user -from ..views import with_menu_context, with_base_data +from ..views import with_menu_context logger = logging.getLogger(__name__) @@ -135,7 +135,6 @@ "User '%s' doesn't exist or password is incorrect." % username) - with_base_data(data) return render_template('login.html', **data) diff -r 8101692fdc11 -r b1a00c2c0c7f piecrust/admin/views/publish.py --- a/piecrust/admin/views/publish.py Sat Oct 07 12:13:57 2017 -0700 +++ b/piecrust/admin/views/publish.py Sat Oct 07 12:16:04 2017 -0700 @@ -4,7 +4,6 @@ from flask.ext.login import login_required from ..blueprint import foodtruck_bp from ..pubutil import PublishLogReader -from ..views import with_menu_context, with_base_data logger = logging.getLogger(__name__) @@ -25,7 +24,6 @@ if not pub_cfg: data = {'error': "There are no publish targets defined in your " "configuration file."} - with_base_data(data) return render_template('error.html', **data) try: