diff --git a/wagtailflags/templates/wagtailflags/includes/flag_breadcrumbs.html b/wagtailflags/templates/wagtailflags/includes/flag_breadcrumbs.html
new file mode 100644
index 0000000..5d6fd74
--- /dev/null
+++ b/wagtailflags/templates/wagtailflags/includes/flag_breadcrumbs.html
@@ -0,0 +1,46 @@
+{% extends 'wagtailadmin/shared/headers/slim_header.html' %}
+{% load i18n wagtailadmin_tags wagtailflags_admin %}
+
+{% comment %}
+It doesn't seem possible to use the `wagtailadmin/shared/breadcrumbs.html` template for non-page-based breadcrumbs.
+
+This implementation borrows heavily from `wagtailsnippets/snippets/headers/_base_header.html`, where the same style breadcrumbs are also re-implemented.
+{% endcomment %}
+
+{% block header_content %}
+ {% with breadcrumb_link_classes='w-flex w-items-center w-h-full w-text-primary w-no-underline w-outline-offset-inside hover:w-underline hover:w-text-primary w-h-full' breadcrumb_item_classes='w-h-full w-flex w-items-center w-overflow-hidden w-transition w-duration-300 w-whitespace-nowrap w-flex-shrink-0 w-font-bold w-text-14' icon_classes='w-w-4 w-h-4 w-ml-3' %}
+
+
+
+
+
+ {% endwith %}
+{% endblock %}
diff --git a/wagtailflags/templates/wagtailflags/includes/flag_header.html b/wagtailflags/templates/wagtailflags/includes/flag_header.html
new file mode 100644
index 0000000..f6db9e4
--- /dev/null
+++ b/wagtailflags/templates/wagtailflags/includes/flag_header.html
@@ -0,0 +1,12 @@
+{% extends 'wagtailadmin/shared/header.html' %}
+{% load i18n wagtailadmin_tags wagtailflags_admin %}
+
+{% block right_column%}
+ {% if flag|deletable %}
+ {% url 'wagtailflags:delete_flag' flag.name as delete_link %}
+
+
+ {% endif %}
+{% endblock %}
diff --git a/wagtailflags/templates/wagtailflags/includes/header.html b/wagtailflags/templates/wagtailflags/includes/header.html
index 1816c29..3106cc4 100644
--- a/wagtailflags/templates/wagtailflags/includes/header.html
+++ b/wagtailflags/templates/wagtailflags/includes/header.html
@@ -1,18 +1,9 @@
-{% load wagtailadmin_tags wagtailflags_admin %}
+{% extends 'wagtailadmin/shared/header.html' %}
+{% load i18n modeladmin_tags wagtailadmin_tags wagtailflags_admin %}
-{% if flag %}
-
-
- {% if flag|deletable %}
- {% url 'wagtailflags:delete_flag' flag.name as delete_link %}
- {% include "wagtailadmin/shared/header.html" with title=title action_icon="bin" action_text='Delete flag' action_url=delete_link %}
- {% else %}
- {% include "wagtailadmin/shared/header.html" with title=title icon=icon %}
- {% endif %}
-{% else %}
+{% block right_column %}
{% url 'wagtailflags:create_flag' as add_link %}
{% include "wagtailadmin/shared/header.html" with title=title action_icon=icon action_text='Add flag' action_url=add_link %}
-{% endif %}
+
+ {% include 'modeladmin/includes/button.html' with button=view.get_add_button_with_parent %}
+{% endblock %}
diff --git a/wagtailflags/templates/wagtailflags/index.html b/wagtailflags/templates/wagtailflags/index.html
index 0d69c46..edefc28 100644
--- a/wagtailflags/templates/wagtailflags/index.html
+++ b/wagtailflags/templates/wagtailflags/index.html
@@ -6,8 +6,8 @@
{% block content %}
{% trans "Flags" as flags_str %}
{% trans "Add a flag" as add_a_flag_str %}
-
- {% include "wagtailflags/includes/header.html" with title=flags_str icon="tag" %}
+ {% url 'wagtailflags:create_flag' as add_link %}
+ {% include "wagtailadmin/shared/header.html" with title=flags_str action_icon=icon action_text=add_a_flag_str action_url=add_link icon="flag" %}
{% if flags|length == 0 %}
diff --git a/wagtailflags/tests/settings.py b/wagtailflags/tests/settings.py
index 5b9843b..0bd72f7 100644
--- a/wagtailflags/tests/settings.py
+++ b/wagtailflags/tests/settings.py
@@ -1,11 +1,12 @@
import os
-import wagtail
+DEBUG = True
ALLOWED_HOSTS = ["*"]
USE_TZ = True
+
SECRET_KEY = "not needed"
ROOT_URLCONF = "wagtailflags.tests.urls"
@@ -23,12 +24,6 @@
},
}
-INSTALLED_APPS = (
- "django.contrib.auth",
- "django.contrib.contenttypes",
- "django.contrib.sessions",
-)
-
WAGTAIL_APPS = (
"wagtail.contrib.forms",
"wagtail.contrib.modeladmin",
@@ -36,31 +31,21 @@
"wagtail.admin",
"wagtail.documents",
"wagtail.images",
+ "wagtail.snippets",
"wagtail.sites",
"wagtail.users",
)
+WAGTAIL_APPS += (
+ "wagtail",
+ "wagtail.test.testapp",
+)
WAGTAILADMIN_RICH_TEXT_EDITORS = {
"default": {"WIDGET": "wagtail.admin.rich_text.DraftailRichTextArea"},
+ "custom": {"WIDGET": "wagtail.test.testapp.rich_text.CustomRichTextArea"},
}
-# Wagtail 3.0 moves testapp from wagtail.tests to wagtail.test
-if wagtail.VERSION >= (3, 0, 0): # pragma: no cover
- WAGTAIL_APPS += (
- "wagtail",
- "wagtail.test.testapp",
- )
- WAGTAILADMIN_RICH_TEXT_EDITORS["custom"] = {
- "WIDGET": "wagtail.test.testapp.rich_text.CustomRichTextArea"
- }
-else: # pragma: no cover
- WAGTAIL_APPS += (
- "wagtail.core",
- "wagtail.tests.testapp",
- )
- WAGTAILADMIN_RICH_TEXT_EDITORS["custom"] = {
- "WIDGET": "wagtail.tests.testapp.rich_text.CustomRichTextArea"
- }
+WAGTAILADMIN_BASE_URL = "http://localhost:8000"
MIDDLEWARE = (
"django.middleware.common.CommonMiddleware",
@@ -71,6 +56,13 @@
"django.middleware.clickjacking.XFrameOptionsMiddleware",
)
+INSTALLED_APPS = (
+ "django.contrib.auth",
+ "django.contrib.contenttypes",
+ "django.contrib.sessions",
+)
+
+
INSTALLED_APPS = (
(
"django.contrib.admin",
@@ -88,7 +80,6 @@
)
)
-STATIC_ROOT = "/tmp/static/"
STATIC_URL = "/static/"
TEMPLATES = [
diff --git a/wagtailflags/tests/test_conditions.py b/wagtailflags/tests/test_conditions.py
index 1fd0b18..8ebbc20 100644
--- a/wagtailflags/tests/test_conditions.py
+++ b/wagtailflags/tests/test_conditions.py
@@ -1,18 +1,12 @@
from django.test import RequestFactory, TestCase
-import wagtail
+from wagtail.models import Site
from flags.conditions import RequiredForCondition
from wagtailflags.conditions import site_condition
-if wagtail.VERSION > (3, 0, 0): # pragma: no cover
- from wagtail.models import Site
-else: # pragma: no cover
- from wagtail.core.models import Site
-
-
class SiteConditionTestCase(TestCase):
def setUp(self):
self.site = Site.objects.get(is_default_site=True)
diff --git a/wagtailflags/tests/test_signals.py b/wagtailflags/tests/test_signals.py
index 8e30acb..4313c8c 100644
--- a/wagtailflags/tests/test_signals.py
+++ b/wagtailflags/tests/test_signals.py
@@ -2,19 +2,13 @@
from django.test import TestCase
-import wagtail
+from wagtail.test.utils import WagtailTestUtils
from flags.models import FlagState
from wagtailflags.signals import flag_disabled, flag_enabled
-if wagtail.VERSION >= (3, 0, 0): # pragma: no cover
- from wagtail.test.utils import WagtailTestUtils
-else: # pragma: no cover
- from wagtail.tests.utils import WagtailTestUtils
-
-
class SignalsTestCase(TestCase, WagtailTestUtils):
def setUp(self):
self.login()
diff --git a/wagtailflags/tests/test_views.py b/wagtailflags/tests/test_views.py
index ecb04de..f0f7926 100644
--- a/wagtailflags/tests/test_views.py
+++ b/wagtailflags/tests/test_views.py
@@ -1,16 +1,10 @@
from django.test import TestCase
-import wagtail
+from wagtail.test.utils import WagtailTestUtils
from flags.models import FlagState
-if wagtail.VERSION >= (3, 0, 0): # pragma: no cover
- from wagtail.test.utils import WagtailTestUtils
-else: # pragma: no cover
- from wagtail.tests.utils import WagtailTestUtils
-
-
class TestWagtailFlagsViews(TestCase, WagtailTestUtils):
def setUp(self):
self.login()
diff --git a/wagtailflags/views.py b/wagtailflags/views.py
index 407ec72..a82c46f 100644
--- a/wagtailflags/views.py
+++ b/wagtailflags/views.py
@@ -110,8 +110,10 @@ def edit_condition(request, name, condition_pk=None):
try:
condition = FlagState.objects.get(pk=condition_pk)
+ title_str = f"Edit {condition} condition"
except FlagState.DoesNotExist:
condition = None
+ title_str = f"Create a condition on {flag.name}"
if request.method == "POST":
form = FlagStateForm(
@@ -129,6 +131,7 @@ def edit_condition(request, name, condition_pk=None):
"form": form,
"condition_str": str(condition),
"condition_pk": condition_pk,
+ "title": title_str,
}
return render(request, "wagtailflags/flags/edit_condition.html", context)
diff --git a/wagtailflags/wagtail_hooks.py b/wagtailflags/wagtail_hooks.py
index 4884620..49239a1 100644
--- a/wagtailflags/wagtail_hooks.py
+++ b/wagtailflags/wagtail_hooks.py
@@ -1,27 +1,20 @@
import django
from django.templatetags.static import static
+from django.urls import include, re_path, reverse
from django.utils.html import format_html
-import wagtail
+from wagtail import hooks
from wagtail.admin.menu import MenuItem
from wagtailflags import views
-if wagtail.VERSION >= (3, 0, 0): # pragma: no cover
- from wagtail import hooks
-else: # pragma: no cover
- from wagtail.core import hooks
-
-from django.urls import include, re_path, reverse
-
-
@hooks.register("register_settings_menu_item")
def register_flags_menu():
return MenuItem(
"Flags",
reverse("wagtailflags:list"),
- icon_name="tag",
+ icon_name="flag",
order=10000,
)
@@ -80,3 +73,8 @@ def global_admin_css():
'',
static("wagtailflags/css/wagtailflags.css"),
)
+
+
+@hooks.register("register_icons")
+def register_icons(icons):
+ return icons + ["wagtailflags/flag.svg"]