diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f251f3e..d0b56e0 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -15,4 +15,6 @@ repos:
rev: v1.34.0
hooks:
- id: djlint-reformat-django
+ args: ["--ignore", "H011"]
- id: djlint-django
+ args: ["--ignore", "H011"]
diff --git a/common/utils.py b/common/utils.py
index 098dc3a..6a5ec38 100644
--- a/common/utils.py
+++ b/common/utils.py
@@ -17,10 +17,10 @@ def Popover(
result = mark_safe(
str(content)
+ render_to_string(
- "components/popover.html",
+ "cotton/popover.html",
{
"id": id,
- "children": popover_content,
+ "slot": popover_content,
},
)
)
diff --git a/games/templates/components.yml b/games/templates/components.yml
deleted file mode 100644
index efe6bf9..0000000
--- a/games/templates/components.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-components:
- gamelink: "components/game_link.html"
- popover: "components/popover.html"
- table: "components/table.html"
- table_row: "components/table_row.html"
- table_td: "components/table_td.html"
- simple_table: "components/simple_table.html"
- button_group_sm: "components/button_group_sm.html"
- button_group_button_sm: "components/button_group_button_sm.html"
- h1: "components/h1.html"
diff --git a/games/templates/components/button_group_sm.html b/games/templates/components/button_group_sm.html
deleted file mode 100644
index 6bd902e..0000000
--- a/games/templates/components/button_group_sm.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
- {% for button in buttons %}
- {% button_group_button_sm href=button.href text=button.text color=button.color %}
- {% endfor %}
-
diff --git a/games/templates/components/edit_button.html b/games/templates/components/edit_button.html
deleted file mode 100644
index 57997ee..0000000
--- a/games/templates/components/edit_button.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
diff --git a/games/templates/components/table_row.html b/games/templates/components/table_row.html
deleted file mode 100644
index 4a12c09..0000000
--- a/games/templates/components/table_row.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% fragment as default_content %}
-{% for td in data %}
- {% if forloop.first %}
- {{ td }} |
- {% else %}
- {% #table_td %}
- {{ td }}
- {% /table_td %}
- {% endif %}
-{% endfor %}
-{% endfragment %}
-
- {{ children|default:default_content }}
-
diff --git a/games/templates/components/table_td.html b/games/templates/components/table_td.html
deleted file mode 100644
index 78cd369..0000000
--- a/games/templates/components/table_td.html
+++ /dev/null
@@ -1 +0,0 @@
-{{ children }} |
diff --git a/games/templates/cotton/button.html b/games/templates/cotton/button.html
new file mode 100644
index 0000000..83f0695
--- /dev/null
+++ b/games/templates/cotton/button.html
@@ -0,0 +1,4 @@
+
diff --git a/games/templates/components/button_group_button_sm.html b/games/templates/cotton/button_group_button_sm.html
similarity index 97%
rename from games/templates/components/button_group_button_sm.html
rename to games/templates/cotton/button_group_button_sm.html
index 2febc2d..2ea43a9 100644
--- a/games/templates/components/button_group_button_sm.html
+++ b/games/templates/cotton/button_group_button_sm.html
@@ -1,4 +1,4 @@
-{% var color=color|default:"gray" %}
+
{% if color == "gray" %}
diff --git a/games/templates/cotton/button_group_sm.html b/games/templates/cotton/button_group_sm.html
new file mode 100644
index 0000000..987db77
--- /dev/null
+++ b/games/templates/cotton/button_group_sm.html
@@ -0,0 +1,6 @@
+
+
+ {% for button in buttons %}
+
+ {% endfor %}
+
diff --git a/games/templates/components/button.html b/games/templates/cotton/button_old.html
similarity index 100%
rename from games/templates/components/button.html
rename to games/templates/cotton/button_old.html
diff --git a/games/templates/components/button_start.html b/games/templates/cotton/button_start.html
similarity index 100%
rename from games/templates/components/button_start.html
rename to games/templates/cotton/button_start.html
diff --git a/games/templates/components/game_link.html b/games/templates/cotton/gamelink.html
similarity index 80%
rename from games/templates/components/game_link.html
rename to games/templates/cotton/gamelink.html
index bcb7cfe..5be4acd 100644
--- a/games/templates/components/game_link.html
+++ b/games/templates/cotton/gamelink.html
@@ -1,8 +1,8 @@
- {% if children %}
- {{ children }}
+ {% if slot %}
+ {{ slot }}
{% else %}
{{ name }}
{% endif %}
diff --git a/games/templates/components/h1.html b/games/templates/cotton/h1.html
similarity index 95%
rename from games/templates/components/h1.html
rename to games/templates/cotton/h1.html
index a532283..3b7ad35 100644
--- a/games/templates/components/h1.html
+++ b/games/templates/cotton/h1.html
@@ -1,5 +1,5 @@