From c1071f3d55984aafd800b5ad54b2d94f09b4c6f2 Mon Sep 17 00:00:00 2001 From: Mark Veidemanis Date: Wed, 10 Aug 2022 07:36:26 +0100 Subject: [PATCH] Combine homepage and search into one class --- app/urls.py | 11 +++------- core/templates/ui/drilldown/drilldown.html | 6 +++--- core/views/ui/drilldown.py | 25 +++++++++++----------- 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/app/urls.py b/app/urls.py index 84d43ad..dfd1346 100644 --- a/app/urls.py +++ b/app/urls.py @@ -51,11 +51,7 @@ from core.views.manage.threshold.threshold import ( ) # Main tool pages -from core.views.ui.drilldown import ( # DrilldownTableView, - Drilldown, - DrilldownSearch, - ThresholdInfoModal, -) +from core.views.ui.drilldown import Drilldown, ThresholdInfoModal # DrilldownTableView, from core.views.ui.insights import ( Insights, InsightsChannels, @@ -85,9 +81,8 @@ urlpatterns = [ path("accounts/", include("django.contrib.auth.urls")), path("accounts/signup/", Signup.as_view(), name="signup"), ## - path("ui/drilldown/", Drilldown.as_view(), name="drilldown"), - path("ui/drilldown/modal/", ThresholdInfoModal.as_view(), name="modal_drilldown"), - path("ui/drilldown/search/", DrilldownSearch.as_view(), name="search_drilldown"), + # path("drilldown/", Drilldown.as_view(), name="drilldown"), + path("modal/", ThresholdInfoModal.as_view(), name="modal_drilldown"), ## path("ui/insights/", Insights.as_view(), name="insights"), path("ui/insights/search/", InsightsSearch.as_view(), name="search_insights"), diff --git a/core/templates/ui/drilldown/drilldown.html b/core/templates/ui/drilldown/drilldown.html index 1f7eec1..b46ef35 100644 --- a/core/templates/ui/drilldown/drilldown.html +++ b/core/templates/ui/drilldown/drilldown.html @@ -66,7 +66,7 @@ }
-
@@ -91,7 +91,7 @@