Mercurial > piecrust2

changeset 888:2b0fa2e4c12f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
admin: Make the admin panel work under a non-rooted URL.
author Ludovic Chabant <ludovic@chabant.com>
date Sun, 02 Jul 2017 22:14:51 -0700
parents c0cbcd4752f0
children 942565723e99
files piecrust/admin/blueprint.py piecrust/admin/templates/layouts/default.html piecrust/admin/templates/layouts/master.html piecrust/admin/views/__init__.py
diffstat 4 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/piecrust/admin/blueprint.py	Tue Jun 20 21:14:41 2017 -0700
+++ b/piecrust/admin/blueprint.py	Sun Jul 02 22:14:51 2017 -0700
@@ -127,6 +127,7 @@
 import piecrust.admin.views.dashboard  # NOQA
 import piecrust.admin.views.edit  # NOQA
 import piecrust.admin.views.menu  # NOQA
+import piecrust.admin.views.micropub  # NOQA
 import piecrust.admin.views.preview  # NOQA
 import piecrust.admin.views.publish  # NOQA
 import piecrust.admin.views.sources  # NOQA
--- a/piecrust/admin/templates/layouts/default.html	Tue Jun 20 21:14:41 2017 -0700
+++ b/piecrust/admin/templates/layouts/default.html	Sun Jul 02 22:14:51 2017 -0700
@@ -8,7 +8,7 @@
 </div>
 <nav class="ft-nav">
     <div class="ft-nav-title">
-        <img src="/static/img/foodtruck.png" alt="Food Truck" />
+        <img src="{{base_url}}/static/img/foodtruck.png" alt="Food Truck" />
         <div class="ft-nav-brand">FoodTruck</div>
     </div>
     {% include 'layouts/menu.html' %}
--- a/piecrust/admin/templates/layouts/master.html	Tue Jun 20 21:14:41 2017 -0700
+++ b/piecrust/admin/templates/layouts/master.html	Sun Jul 02 22:14:51 2017 -0700
@@ -7,7 +7,7 @@
         <meta name="description" content="A PieCrust management dashboard"/>
         <meta name="viewport" content="width=device-width, initial-scale=1"/>
         <link rel="apple-touch-icon" href="apple-touch-icon.png"/>
-        <link rel="stylesheet" href="/static/css/foodtruck.min.css"/>
+        <link rel="stylesheet" href="{{base_url}}/static/css/foodtruck.min.css"/>
         <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'/>
     </head>
     <body>
@@ -37,7 +37,7 @@
                 and many more.</p>
             </footer>
         </div>
-        <script src="/static/js/foodtruck.min.js"></script>
+        <script src="{{base_url}}/static/js/foodtruck.min.js"></script>
     </body>
 </html>
 
--- a/piecrust/admin/views/__init__.py	Tue Jun 20 21:14:41 2017 -0700
+++ b/piecrust/admin/views/__init__.py	Sun Jul 02 22:14:51 2017 -0700
@@ -1,4 +1,4 @@
-from flask import render_template
+from flask import render_template, current_app
 from flask.views import View
 from .menu import get_menu_context
 
@@ -24,5 +24,6 @@
     if context is None:
         context = {}
     context['menu'] = get_menu_context()
+    context['base_url'] = current_app.config['FOODTRUCK_URL_PREFIX']
     return context