From 876e4ed1fc62d3afdfff12e744350d6d09598b53 Mon Sep 17 00:00:00 2001
From: Tyler Burton <tyler.burton@gsa.gov>
Date: Fri, 22 Nov 2024 15:05:36 -0600
Subject: [PATCH 1/2] fixes jinja template conditional; removes redundant css

---
 Makefile                                                     | 2 +-
 .../datagovtheme/fanstatic_library/styles/datagovtheme.css   | 5 -----
 ckanext/datagovtheme/public/css/datagovtheme.css             | 4 ----
 ckanext/datagovtheme/templates/header.html                   | 2 +-
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 7d8e8d6e..e771e2bf 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ clean: ## Clean workspace and containers
 	CKAN_VERSION=$(CKAN_VERSION) docker compose  -f $(COMPOSE_FILE) down -v --remove-orphans
 
 lint: ## Lint the code (python 3 only)
-	docker compose  -f $(COMPOSE_FILE) run --rm ckan flake8 ckanext --count --show-source --statistics --exclude ckan
+	CKAN_VERSION=$(CKAN_VERSION) docker compose -f $(COMPOSE_FILE) run --rm ckan flake8 ckanext --count --show-source --statistics --exclude ckan
 
 test: ## Run extension tests
 	CKAN_VERSION=$(CKAN_VERSION) docker compose  -f $(COMPOSE_FILE) run --rm ckan ./test.sh
diff --git a/ckanext/datagovtheme/fanstatic_library/styles/datagovtheme.css b/ckanext/datagovtheme/fanstatic_library/styles/datagovtheme.css
index 6bd98485..b0aa60cc 100644
--- a/ckanext/datagovtheme/fanstatic_library/styles/datagovtheme.css
+++ b/ckanext/datagovtheme/fanstatic_library/styles/datagovtheme.css
@@ -2851,10 +2851,6 @@ body .usa-menu-btn {
         border-radius: 0;
         width: 100%;
     }
-    .control-custom input {
-        border-radius: 0;
-        width: 100%;
-    }
 }
 
 /* CKAN DEBUG PANEL SCROLL FIX */
@@ -2862,7 +2858,6 @@ body .usa-menu-btn {
     overflow: scroll;
 }
 
-
 .search-helper {
     font-style: italic;
 }
\ No newline at end of file
diff --git a/ckanext/datagovtheme/public/css/datagovtheme.css b/ckanext/datagovtheme/public/css/datagovtheme.css
index 0130cf12..faf0a645 100644
--- a/ckanext/datagovtheme/public/css/datagovtheme.css
+++ b/ckanext/datagovtheme/public/css/datagovtheme.css
@@ -2248,10 +2248,6 @@ margin-top: 0px;
         border-radius: 0;
         width: 100%;
     }
-    .control-custom input {
-        border-radius: 0;
-        width: 100%;
-    }
 }
 
 .faded.disclaimer {
diff --git a/ckanext/datagovtheme/templates/header.html b/ckanext/datagovtheme/templates/header.html
index a241cbde..4a9975b1 100644
--- a/ckanext/datagovtheme/templates/header.html
+++ b/ckanext/datagovtheme/templates/header.html
@@ -78,7 +78,7 @@
                         <button class="usa-nav__close">
                             <img src="/images/close.svg" alt="Close" />
                         </button>
-                        {% if request.endpoint.startswith('report.') %}
+                        {% if request and request.endpoint and request.endpoint.startswith('report.') %}
                             {% set current_is_report = 'usa-current' %}
                             {% set current_is_dataset = '' %}
                         {% else %}

From 948b2e8a4c1572900ab5fdc9ddebd8ffd07aa4ea Mon Sep 17 00:00:00 2001
From: Tyler Burton <tyler.burton@gsa.gov>
Date: Mon, 9 Dec 2024 12:51:11 -0600
Subject: [PATCH 2/2] bump plugin version

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 1970c460..72ac9cab 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@
 
 setup(
     name="ckanext-datagovtheme",
-    version="0.2.39",
+    version="0.2.40",
     description="CKAN Extension to manage data.gov theme",
     long_description=long_description,
     classifiers=[