Merge branch 'cleanup/remove-diagram-proxy' into development
This commit is contained in:
@@ -51,7 +51,6 @@ INSTALLED_APPS = [
|
|||||||
'mptt',
|
'mptt',
|
||||||
'pages',
|
'pages',
|
||||||
'nested_admin',
|
'nested_admin',
|
||||||
'revproxy.apps.RevProxyConfig',
|
|
||||||
]
|
]
|
||||||
|
|
||||||
MIDDLEWARE = [
|
MIDDLEWARE = [
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ from django.contrib import admin
|
|||||||
from django.urls import include, path, re_path
|
from django.urls import include, path, re_path
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.conf.urls.static import static
|
from django.conf.urls.static import static
|
||||||
from diagramm_proxy.views import DiagrammProxyView
|
|
||||||
import dokumente.views
|
import dokumente.views
|
||||||
import pages.views
|
import pages.views
|
||||||
import referenzen.views
|
import referenzen.views
|
||||||
@@ -33,7 +32,6 @@ urlpatterns = [
|
|||||||
path('stichworte/', include("stichworte.urls")),
|
path('stichworte/', include("stichworte.urls")),
|
||||||
path('referenzen/', referenzen.views.tree, name="referenz_tree"),
|
path('referenzen/', referenzen.views.tree, name="referenz_tree"),
|
||||||
path('referenzen/<str:refid>/', referenzen.views.detail, name="referenz_detail"),
|
path('referenzen/<str:refid>/', referenzen.views.detail, name="referenz_detail"),
|
||||||
re_path(r'^diagramm/(?P<path>.*)$', DiagrammProxyView.as_view()),
|
|
||||||
]
|
]
|
||||||
|
|
||||||
# Serve static files
|
# Serve static files
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
# Diagram proxy module
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
from revproxy.views import ProxyView
|
|
||||||
|
|
||||||
class DiagrammProxyView(ProxyView):
|
|
||||||
upstream = "http://svckroki:8000/"
|
|
||||||
@@ -31,6 +31,6 @@
|
|||||||
<div class="flex-fill">{% block content %}Main Content{% endblock %}</div>
|
<div class="flex-fill">{% block content %}Main Content{% endblock %}</div>
|
||||||
<div class="col-md-2">{% block sidebar_right %}{% endblock %}</div>
|
<div class="col-md-2">{% block sidebar_right %}{% endblock %}</div>
|
||||||
</div>
|
</div>
|
||||||
<div>VorgabenUI v0.944</div>
|
<div>VorgabenUI v0.945</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
Reference in New Issue
Block a user