+ {% trans %}
+ This account is inactive.
+ {% endtrans %}
+
+{% endblock account_content %}
diff --git a/sampleapp/templates/account/components/account_box.html b/sampleapp/templates/account/components/account_box.html
deleted file mode 100644
index 17e6d38..0000000
--- a/sampleapp/templates/account/components/account_box.html
+++ /dev/null
@@ -1,28 +0,0 @@
-
+ {% trans %}
+ Are you sure you want to sign out?
+ {% endtrans %}
+
+
- {% trans "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it." %}
-
-
- {% blocktrans %}Please contact us if you have any trouble resetting your password.{% endblocktrans %}
-
-{% endblock content %}
diff --git a/sampleapp/templates/account/password_reset.jinja b/sampleapp/templates/account/password_reset.jinja
new file mode 100644
index 0000000..016280e
--- /dev/null
+++ b/sampleapp/templates/account/password_reset.jinja
@@ -0,0 +1,30 @@
+{% from 'django/forms/inputgroup.jinja' import inputgroup %}
+{% from 'components/button.jinja' import button %}
+{% extends "account/account_base.jinja" %}
+{% block account_title %}
+ {% trans %}
+ Reset Password
+ {% endtrans %}
+{% endblock account_title %}
+{% block account_content %}
+ {% if request.user.is_authenticated %}
+ {% include "account/snippets/already_logged_in.jinja" %}
+ {% endif %}
+
+ {% trans %}
+ Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it.
+ {% endtrans %}
+
+
+ {% trans %}
+ Please contact us if you have any trouble resetting your password.
+ {% endtrans %}
+
+{% endblock account_content %}
diff --git a/sampleapp/templates/account/password_reset_done.html b/sampleapp/templates/account/password_reset_done.html
deleted file mode 100644
index a1834b5..0000000
--- a/sampleapp/templates/account/password_reset_done.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% load account %}
-{% block head_title %}
- {% trans "Password Reset" %}
-{% endblock head_title %}
-{% block content %}
-
- {% blocktrans %}We have sent you an e-mail. If you have not received it please check your spam folder. Otherwise contact us if you do not receive it in a few minutes.{% endblocktrans %}
-
-{% endblock content %}
diff --git a/sampleapp/templates/account/password_reset_done.jinja b/sampleapp/templates/account/password_reset_done.jinja
new file mode 100644
index 0000000..86ab5ed
--- /dev/null
+++ b/sampleapp/templates/account/password_reset_done.jinja
@@ -0,0 +1,16 @@
+{% extends "account/account_base.jinja" %}
+{% block account_title %}
+ {% trans %}
+ Password Reset
+ {% endtrans %}
+{% endblock account_title %}
+{% block account_content %}
+ {% if request.user.is_authenticated %}
+ {% include "account/snippets/already_logged_in.jinja" %}
+ {% endif %}
+
+ {% trans %}
+ We have sent you an e-mail. If you have not received it please check your spam folder. Otherwise contact us if you do not receive it in a few minutes.
+ {% endtrans %}
+
+{% endblock account_content %}
diff --git a/sampleapp/templates/account/password_reset_from_key.html b/sampleapp/templates/account/password_reset_from_key.html
deleted file mode 100644
index 5413f41..0000000
--- a/sampleapp/templates/account/password_reset_from_key.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% block head_title %}
- {% trans "Change Password" %}
-{% endblock head_title %}
-{% block content %}
-
- {% blocktrans %}The password reset link was invalid, possibly because it has already been used. Please request a new password reset .{% endblocktrans %}
-
- {% else %}
-
+ {% trans %}
+ The password reset link was invalid, possibly because it has already been used. Please request a new password reset .
+ {% endtrans %}
+
+ {% else %}
+
+ {% trans %}
+ Your password is now changed.
+ {% endtrans %}
+
+{% endblock account_content %}
diff --git a/sampleapp/templates/account/password_set.html b/sampleapp/templates/account/password_set.html
deleted file mode 100644
index ae34235..0000000
--- a/sampleapp/templates/account/password_set.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% block head_title %}
- {% trans "Set Password" %}
-{% endblock head_title %}
-{% block content %}
-
{{ errors }}
{% for field, errors in fields %}
{% if field.name == 'first_name' or field.name == 'last_name' %}
- {% include "django/forms/inputgroup.html" with field=field errors=errors layout_classes="w-5/12" %}
+ {{ inputgroup(field, errors, 'w-5/12') }}
{% else %}
- {% include "django/forms/inputgroup.html" with field=field errors=errors %}
+ {{ inputgroup(field, errors) }}
{% endif %}
{% endfor %}
{% for field in hidden_fields %}{{ field }}{% endfor %}
diff --git a/sampleapp/templates/account/welcome.html b/sampleapp/templates/account/welcome.html
deleted file mode 100644
index 3b3ec21..0000000
--- a/sampleapp/templates/account/welcome.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% load account %}
-{% block head_title %}
- {% trans "Sign In" %}
-{% endblock head_title %}
-{% block content %}
-
{% component "welcome_box" %}
-{% endblock content %}
diff --git a/sampleapp/templates/account/welcome.jinja b/sampleapp/templates/account/welcome.jinja
new file mode 100644
index 0000000..a046dd5
--- /dev/null
+++ b/sampleapp/templates/account/welcome.jinja
@@ -0,0 +1,49 @@
+{% from 'django/forms/inputgroup.jinja' import inputgroup %}
+{% import 'svg/svg.jinja' as svg %}
+{% extends "account/account_base.jinja" %}
+{% block account_title %}
+ {% trans "Sign In" %}
+ {% endtrans %}
+{% endblock account_title %}
+{% block account_content %}
+
+
+
+{% endblock account_content %}
diff --git a/sampleapp/templates/base.html b/sampleapp/templates/base.html
deleted file mode 100644
index 9a750ef..0000000
--- a/sampleapp/templates/base.html
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
-
-
-
-
-
- {% load django_vite %}
- {% vite_hmr_client %}
- {% vite_asset 'js/main.ts' %}
- {% load django_htmx %}
- {% django_htmx_script %}
- {% block extra_head %}
-
Lightmatter
- {% endblock extra_head %}
-
-
- {% include "header/base.html" %}
-
- {% block content %}
- {% endblock content %}
-
- {% include "util/messages.html" %}
-
-
- {% include "footer.html" %}
-
-
-
diff --git a/sampleapp/templates/base.jinja b/sampleapp/templates/base.jinja
new file mode 100644
index 0000000..59881df
--- /dev/null
+++ b/sampleapp/templates/base.jinja
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+ {{ vite_hmr_client() }}
+ {{ vite_asset('js/main.ts') }}
+ {{ django_htmx_script() }}
+ {% block extra_head %}
+
Lightmatter
+ {% endblock extra_head %}
+
+
+ {% include "header/base.jinja" %}
+
+ {% block content %}
+ {% endblock content %}
+
+ {% include "util/messages.jinja" %}
+
+
+ {% include "footer.jinja" %}
+
+
+
diff --git a/sampleapp/templates/components/button.html b/sampleapp/templates/components/button.html
deleted file mode 100644
index 4dbcc28..0000000
--- a/sampleapp/templates/components/button.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
- {{ text }}
-
diff --git a/sampleapp/templates/components/button.jinja b/sampleapp/templates/components/button.jinja
new file mode 100644
index 0000000..943c610
--- /dev/null
+++ b/sampleapp/templates/components/button.jinja
@@ -0,0 +1,6 @@
+{% macro button(button_content='Button', type='button') %}
+
+ {{ button_content }}
+
+{% endmacro %}
diff --git a/sampleapp/templates/components/menu.html b/sampleapp/templates/components/menu.html
deleted file mode 100644
index f24714b..0000000
--- a/sampleapp/templates/components/menu.html
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
- {% slot "button" %}{% endslot %}
-
-
-
diff --git a/sampleapp/templates/components/menu.jinja b/sampleapp/templates/components/menu.jinja
new file mode 100644
index 0000000..b14917d
--- /dev/null
+++ b/sampleapp/templates/components/menu.jinja
@@ -0,0 +1,47 @@
+{% from 'components/button.jinja' import button %}
+{% set default_button %}
+{{ button()}}
+{% endset %}
+{% set default_content %}
+
+{% endset %}
+{% macro menu(button=default_button, content=default_content, button_style="text-gray-500 group bg-white rounded-md
+ inline-flex items-center text-base font-medium hover:text-gray-900 focus:outline-none focus:ring-2 focus:ring-offset-2
+ focus:ring-indigo-500", menu_style="absolute z-10 left-1/2 transform -translate-x-1/2 mt-3 px-2 w-screen max-w-xs
+ sm:px-0") %}
+
+{% endmacro %}
diff --git a/sampleapp/templates/current_time.html b/sampleapp/templates/current_time.html
deleted file mode 100644
index a68238f..0000000
--- a/sampleapp/templates/current_time.html
+++ /dev/null
@@ -1 +0,0 @@
-{% now "jS F Y H:i:s" %}
diff --git a/sampleapp/templates/current_time.jinja b/sampleapp/templates/current_time.jinja
new file mode 100644
index 0000000..09635dc
--- /dev/null
+++ b/sampleapp/templates/current_time.jinja
@@ -0,0 +1,9 @@
+
+
Using globals: {{ template_localtime(now()) }}
+
Using filters: {{ now()|template_localtime }}
+
+ Using alpine:
+
+
+
+
diff --git a/sampleapp/templates/django/forms/checkbox.html b/sampleapp/templates/django/forms/checkbox.html
deleted file mode 100644
index 27bddcd..0000000
--- a/sampleapp/templates/django/forms/checkbox.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
{{ field }}
-
- {% if field.label %}{{ field.label_tag }}{% endif %}
-
- {{ field.help_text|safe }}
-
-
-
diff --git a/sampleapp/templates/django/forms/checkbox.jinja b/sampleapp/templates/django/forms/checkbox.jinja
new file mode 100644
index 0000000..30bb5ae
--- /dev/null
+++ b/sampleapp/templates/django/forms/checkbox.jinja
@@ -0,0 +1,11 @@
+{% macro checkbox(field) %}
+
+
{{ field }}
+
+ {% if field.label %}{{ field.label_tag() }}{% endif %}
+
+ {{ field.help_text|safe }}
+
+
+
+{% endmacro %}
diff --git a/sampleapp/templates/django/forms/default.html b/sampleapp/templates/django/forms/default.html
deleted file mode 100644
index 55cedbc..0000000
--- a/sampleapp/templates/django/forms/default.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
- {{ errors }}
- {% for field, errors in fields %}
- {% include "django/forms/inputgroup.html" with field=field errors=errors %}
- {% endfor %}
- {% for field in hidden_fields %}{{ field }}{% endfor %}
-
diff --git a/sampleapp/templates/django/forms/default.jinja b/sampleapp/templates/django/forms/default.jinja
new file mode 100644
index 0000000..2f7064a
--- /dev/null
+++ b/sampleapp/templates/django/forms/default.jinja
@@ -0,0 +1,8 @@
+{% from 'django/forms/inputgroup.jinja' import inputgroup %}
+{% macro default(field, errors) %}
+
+ {{ errors }}
+ {% for field, errors in fields %}{{ inputgroup(field, errors )}}{% endfor %}
+ {% for field in hidden_fields %}{{ field }}{% endfor %}
+
+{% endmacro %}
diff --git a/sampleapp/templates/django/forms/errors/list/default.html b/sampleapp/templates/django/forms/errors/list/default.jinja
similarity index 100%
rename from sampleapp/templates/django/forms/errors/list/default.html
rename to sampleapp/templates/django/forms/errors/list/default.jinja
diff --git a/sampleapp/templates/django/forms/inputgroup.html b/sampleapp/templates/django/forms/inputgroup.html
deleted file mode 100644
index 97fcd38..0000000
--- a/sampleapp/templates/django/forms/inputgroup.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
- {% if field.label %}{{ field.label_tag }}{% endif %}
-
- {{ field }}
- {% if errors %}
-
- {% endif %}
-
- {% if errors %}
- {{ errors }}
- {% elif field.help_text %}
-
- {{ field.help_text|safe }}
-
- {% endif %}
-
diff --git a/sampleapp/templates/django/forms/inputgroup.jinja b/sampleapp/templates/django/forms/inputgroup.jinja
new file mode 100644
index 0000000..eebc450
--- /dev/null
+++ b/sampleapp/templates/django/forms/inputgroup.jinja
@@ -0,0 +1,29 @@
+{% macro inputgroup(field, errors='', layout_classes='w-full', css_classes='') %}
+
+ {% if field.label %}{{ field.label_tag() }}{% endif %}
+
+ {{ field }}
+ {% if errors %}
+
+ {% endif %}
+
+ {% if errors %}
+
{{ errors }}
+ {% elif field.help_text %}
+
+ {{ field.help_text|safe }}
+
+ {% endif %}
+
+{% endmacro %}
diff --git a/sampleapp/templates/django/forms/label.html b/sampleapp/templates/django/forms/label.html
deleted file mode 100644
index b34e18d..0000000
--- a/sampleapp/templates/django/forms/label.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% if use_tag %}
- <{{ tag|default:'label' }}
- {% include 'django/forms/attrs.html' %}
- class="block text-sm font-medium text-gray-700">{{ field.label }}
-{% else %}
- {{ field.label }}
-{% endif %}
diff --git a/sampleapp/templates/django/forms/label.jinja b/sampleapp/templates/django/forms/label.jinja
new file mode 100644
index 0000000..9a78a71
--- /dev/null
+++ b/sampleapp/templates/django/forms/label.jinja
@@ -0,0 +1,9 @@
+{% macro label(field, tag='label') %}
+ {% if use_tag %}
+ <{{ tag }}
+ {% include 'django/forms/attrs.jinja' %}
+ class="block text-sm font-medium text-gray-700">{{ field.label }}
+ {% else %}
+ {{ field.label }}
+ {% endif %}
+{% endmacro %}
diff --git a/sampleapp/templates/django/forms/widgets/input.html b/sampleapp/templates/django/forms/widgets/input.jinja
similarity index 73%
rename from sampleapp/templates/django/forms/widgets/input.html
rename to sampleapp/templates/django/forms/widgets/input.jinja
index a55363a..d4949b1 100644
--- a/sampleapp/templates/django/forms/widgets/input.html
+++ b/sampleapp/templates/django/forms/widgets/input.jinja
@@ -1,4 +1,4 @@
+ {% include "django/forms/widgets/attrs.jinja" %}>
diff --git a/sampleapp/templates/django/forms/widgets/password.html b/sampleapp/templates/django/forms/widgets/password.jinja
similarity index 97%
rename from sampleapp/templates/django/forms/widgets/password.html
rename to sampleapp/templates/django/forms/widgets/password.jinja
index 3448290..a4ab378 100644
--- a/sampleapp/templates/django/forms/widgets/password.html
+++ b/sampleapp/templates/django/forms/widgets/password.jinja
@@ -1,4 +1,4 @@
-
+
-
-
-
-
-
-
-
-
-
-
- © 2021 Lightmatter, Inc. All rights reserved.
-
-
- {% include "header/mobile_menu_button.html" %}
- {% include "header/logo.html" %}
- {% include "header/desktop_center.html" %}
+ {% include "header/mobile_menu_button.jinja" %}
+ {% include "header/logo.jinja" %}
+ {% include "header/desktop_center.jinja" %}
-
{% include "header/end.html" %}
+
{% include "header/end.jinja" %}
- {% include "header/mobile_menu.html" %}
+ {% include "header/mobile_menu.jinja" %}
diff --git a/sampleapp/templates/header/desktop_center.html b/sampleapp/templates/header/desktop_center.jinja
similarity index 100%
rename from sampleapp/templates/header/desktop_center.html
rename to sampleapp/templates/header/desktop_center.jinja
diff --git a/sampleapp/templates/header/end.html b/sampleapp/templates/header/end.html
deleted file mode 100644
index d3fd464..0000000
--- a/sampleapp/templates/header/end.html
+++ /dev/null
@@ -1,53 +0,0 @@
-{% if not request.user.is_authenticated %}
-
-{% else %}
-
-
- {% component_block "menu" menu_style="origin-top-right absolute right-0 mt-2 w-48 py-1 bg-white focus:outline-none" button_style="bg-white rounded-full flex text-sm focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500" %}
- {% slot button %}
-
Open user menu
-
-
- {% endslot button %}
- {% slot "content" %}
-
-{% endslot %}
-{% endcomponent_block %}
-
Open user menu
+
+
+ {{ menu(button(button_for_menu), content_for_menu, "bg-white rounded-full flex text-sm focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500", "origin-top-right absolute right-0 mt-2 w-48 py-1 bg-white focus:outline-none") }}
+
+{% endif %}
diff --git a/sampleapp/templates/header/logo.html b/sampleapp/templates/header/logo.jinja
similarity index 60%
rename from sampleapp/templates/header/logo.html
rename to sampleapp/templates/header/logo.jinja
index cc2df99..ea166b7 100644
--- a/sampleapp/templates/header/logo.html
+++ b/sampleapp/templates/header/logo.jinja
@@ -1,10 +1,10 @@
diff --git a/sampleapp/templates/header/mobile_menu.html b/sampleapp/templates/header/mobile_menu.jinja
similarity index 85%
rename from sampleapp/templates/header/mobile_menu.html
rename to sampleapp/templates/header/mobile_menu.jinja
index cecbec5..d81cfd1 100644
--- a/sampleapp/templates/header/mobile_menu.html
+++ b/sampleapp/templates/header/mobile_menu.jinja
@@ -24,12 +24,12 @@
+ src="https://images.unsplash.com/photo-1601814933824-fd0b574dd592?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1112&q=80"
+ alt="{{ request.user.first_name }} {{ request.user.last_name }} Profile">
-
Tom Cook
-
tom@example.com
+
{{ request.user.first_name }} {{ request.user.last_name }}
+
{{ request.user.email }}
diff --git a/sampleapp/templates/header/mobile_menu_button.html b/sampleapp/templates/header/mobile_menu_button.jinja
similarity index 100%
rename from sampleapp/templates/header/mobile_menu_button.html
rename to sampleapp/templates/header/mobile_menu_button.jinja
diff --git a/sampleapp/templates/index.html b/sampleapp/templates/index.html
deleted file mode 100644
index ec7bdba..0000000
--- a/sampleapp/templates/index.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% extends "base.html" %}
-{% block title %}
- Lightmatter Base Install
-{% endblock title %}
-{% block content %}
-
- Hello - it is now
-
- {% include 'current_time.html' %}
-
-
Refresh time
-
test redirect
-
- Panel Header
-
-
default slot time
-
+ {% set greeting='Hello There!' %}
+ {% set greeting_styled %}
+
{{ greeting }}
+ {% endset %}
+
{{ greeting_styled }}
+
{% include 'current_time.jinja' %}
+
+ Refresh time
+
+
{% include 'random_chart.jinja' %}
+
+ Refresh Chart
+
+
+ Panel Header
+
+
+
+ Twitter
+
+
+{% endmacro %}
+{% macro facebook() %}
+
+
+ Facebook
+
+
+{% endmacro %}
+{% macro github() %}
+
+
+ Github
+
+
+{% endmacro %}
+{% macro instagram() %}
+
+
+ Instagram
+
+
+{% endmacro %}
+{% macro dribble() %}
+
+
+ Dribble
+
+
+{% endmacro %}
+{% macro apple() %}
+
+
+ Apple
+
+
+{% endmacro %}
+{% macro slack() %}
+
+
+ Slack
+
+
+
+
+{% endmacro %}
+{% macro google() %}
+
+
+ Google
+
+
+
+
+{% endmacro %}
+{% macro linkedin() %}
+
+
+ Linkedin
+
+
+{% endmacro %}
+{% macro django() %}
+
+
+ Django
+
+
+{% endmacro %}
+{% macro alpine() %}
+
+
+ Alpine
+
+
+
+
+{% endmacro %}
+{% macro discord() %}
+
+
+ Discord
+
+
+{% endmacro %}
+{% macro signal() %}
+
+
+ Signal
+
+
+{% endmacro %}
diff --git a/sampleapp/templates/util/messages.html b/sampleapp/templates/util/messages.jinja
similarity index 100%
rename from sampleapp/templates/util/messages.html
rename to sampleapp/templates/util/messages.jinja
diff --git a/sampleapp/templates/util/social.html b/sampleapp/templates/util/social.jinja
similarity index 95%
rename from sampleapp/templates/util/social.html
rename to sampleapp/templates/util/social.jinja
index 2332bb3..466170a 100644
--- a/sampleapp/templates/util/social.html
+++ b/sampleapp/templates/util/social.jinja
@@ -1,8 +1,5 @@
- {% if page.seo_title %}
- {{ page.seo_title }}
- {% else %}
- {% endif %}
+ {% if page.seo_title %}{{ page.seo_title }}{% endif %}
- 
+{% endset %}
+{% set content_for_menu %}
+
+ src="https://images.unsplash.com/photo-1601814933824-fd0b574dd592?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1112&q=80"
+ alt="{{ request.user.first_name }} {{ request.user.last_name }} Profile">