diff --git a/austax/templates/cgt_adjustments.html b/austax/templates/cgt_adjustments.html index 2983b7e..416929a 100644 --- a/austax/templates/cgt_adjustments.html +++ b/austax/templates/cgt_adjustments.html @@ -15,7 +15,7 @@ along with this program. If not, see . #} -{% extends 'base_tailwind.html' %} +{% extends 'base.html' %} {% block title %}CGT adjustments{% endblock %} {% block content %} diff --git a/austax/templates/cgt_adjustments_edit.html b/austax/templates/cgt_adjustments_edit.html index d075641..de93b66 100644 --- a/austax/templates/cgt_adjustments_edit.html +++ b/austax/templates/cgt_adjustments_edit.html @@ -15,7 +15,7 @@ along with this program. If not, see . #} -{% extends 'base_tailwind.html' %} +{% extends 'base.html' %} {% block title %}{{ 'Edit' if adjustment else 'New' }} CGT adjustment{% endblock %} {% block content %} diff --git a/austax/templates/cgt_adjustments_multinew.html b/austax/templates/cgt_adjustments_multinew.html index 5d3bc96..890492f 100644 --- a/austax/templates/cgt_adjustments_multinew.html +++ b/austax/templates/cgt_adjustments_multinew.html @@ -15,7 +15,7 @@ along with this program. If not, see . #} -{% extends 'base_tailwind.html' %} +{% extends 'base.html' %} {% block title %}Multiple CGT adjustments{% endblock %} {% block content %} diff --git a/austax/templates/cgt_assets.html b/austax/templates/cgt_assets.html index 16b0aa4..1145f47 100644 --- a/austax/templates/cgt_assets.html +++ b/austax/templates/cgt_assets.html @@ -15,7 +15,7 @@ along with this program. If not, see . #} -{% extends 'base_tailwind.html' %} +{% extends 'base.html' %} {% block title %}CGT assets{% endblock %} {% block content %} diff --git a/drcr/templates/base.html b/drcr/templates/base.html index 1db8b46..2ef9a0b 100644 --- a/drcr/templates/base.html +++ b/drcr/templates/base.html @@ -1,5 +1,5 @@ {# DrCr: Web-based double-entry bookkeeping framework - Copyright (C) 2022–2023 Lee Yingtong Li (RunasSudo) + Copyright (C) 2022–2024 Lee Yingtong Li (RunasSudo) This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -16,47 +16,65 @@ #} - + {% block title %}{% endblock %} - - - + + - + {% block body %} - -
- {% block content %}{% endblock %} {% if config['DEBUG'] %} -
-

Queries executed in {{ dbtime() }} msec. Page generated in __EXECUTION_TIME__ msec.

+
+
+
+ Queries executed in {{ dbtime() }} msec. Page generated in __EXECUTION_TIME__ msec. +
+
{% endif %}
{% endblock %} - {##} {% block scripts %}{% endblock %} diff --git a/drcr/templates/base_tailwind.html b/drcr/templates/base_tailwind.html deleted file mode 100644 index 2ef9a0b..0000000 --- a/drcr/templates/base_tailwind.html +++ /dev/null @@ -1,80 +0,0 @@ -{# DrCr: Web-based double-entry bookkeeping framework - Copyright (C) 2022–2024 Lee Yingtong Li (RunasSudo) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . -#} - - - - - - - {% block title %}{% endblock %} - - - - - {% block body %} -
- {# Navigation bar #} - - -
-
-
- {% block content %}{% endblock %} -
-
-
- - {% if config['DEBUG'] %} -
-
-
- Queries executed in {{ dbtime() }} msec. Page generated in __EXECUTION_TIME__ msec. -
-
-
- {% endif %} -
- {% endblock %} - - {% block scripts %}{% endblock %} - - diff --git a/drcr/templates/chart_of_accounts.html b/drcr/templates/chart_of_accounts.html index 59b5aa6..62aa385 100644 --- a/drcr/templates/chart_of_accounts.html +++ b/drcr/templates/chart_of_accounts.html @@ -15,7 +15,7 @@ along with this program. If not, see . #} -{% extends 'base_tailwind.html' %} +{% extends 'base.html' %} {% block title %}Chart of accounts{% endblock %} {% block content %} diff --git a/drcr/templates/general_ledger.html b/drcr/templates/general_ledger.html index cd1f8b6..8a96fc7 100644 --- a/drcr/templates/general_ledger.html +++ b/drcr/templates/general_ledger.html @@ -15,7 +15,7 @@ along with this program. If not, see . #} -{% extends 'base_tailwind.html' %} +{% extends 'base.html' %} {% block title %}General ledger{% endblock %} {% block content %} diff --git a/drcr/templates/index.html b/drcr/templates/index.html index 4570345..db3fad1 100644 --- a/drcr/templates/index.html +++ b/drcr/templates/index.html @@ -15,7 +15,7 @@ along with this program. If not, see . #} -{% extends 'base_tailwind.html' %} +{% extends 'base.html' %} {% block title %}DrCr{% endblock %} {% block content %} diff --git a/drcr/templates/journal/balance_assertions.html b/drcr/templates/journal/balance_assertions.html index 7a241ae..5b190ec 100644 --- a/drcr/templates/journal/balance_assertions.html +++ b/drcr/templates/journal/balance_assertions.html @@ -15,7 +15,7 @@ along with this program. If not, see . #} -{% extends 'base_tailwind.html' %} +{% extends 'base.html' %} {% block title %}Balance assertions{% endblock %} {% block content %} diff --git a/drcr/templates/journal/balance_assertions_edit.html b/drcr/templates/journal/balance_assertions_edit.html index bf5011d..3bb1b4a 100644 --- a/drcr/templates/journal/balance_assertions_edit.html +++ b/drcr/templates/journal/balance_assertions_edit.html @@ -15,7 +15,7 @@ along with this program. If not, see . #} -{% extends 'base_tailwind.html' %} +{% extends 'base.html' %} {% block title %}{{ 'Edit' if assertion else 'New' }} balance assertion{% endblock %} {% block content %} diff --git a/drcr/templates/journal/journal.html b/drcr/templates/journal/journal.html index c59514d..51df56a 100644 --- a/drcr/templates/journal/journal.html +++ b/drcr/templates/journal/journal.html @@ -15,7 +15,7 @@ along with this program. If not, see . #} -{% extends 'base_tailwind.html' %} +{% extends 'base.html' %} {% block title %}Journal{% endblock %} {% block content %} diff --git a/drcr/templates/journal/journal_edit_transaction.html b/drcr/templates/journal/journal_edit_transaction.html index 40dc179..41b9391 100644 --- a/drcr/templates/journal/journal_edit_transaction.html +++ b/drcr/templates/journal/journal_edit_transaction.html @@ -15,7 +15,7 @@ along with this program. If not, see . #} -{% extends 'base_tailwind.html' %} +{% extends 'base.html' %} {% block title %}{{ 'Edit' if transaction and transaction.id else 'New' }} transaction{% endblock %} {% block content %} diff --git a/drcr/templates/report.html b/drcr/templates/report.html index c2e5f15..800dda2 100644 --- a/drcr/templates/report.html +++ b/drcr/templates/report.html @@ -15,7 +15,7 @@ along with this program. If not, see . #} -{% extends 'base_tailwind.html' %} +{% extends 'base.html' %} {% block title %}{{ report.title }}{% endblock %} {% macro render_section(section) %} diff --git a/drcr/templates/statements/import.html b/drcr/templates/statements/import.html index 726b749..9d844a6 100644 --- a/drcr/templates/statements/import.html +++ b/drcr/templates/statements/import.html @@ -15,7 +15,7 @@ along with this program. If not, see . #} -{% extends 'base_tailwind.html' %} +{% extends 'base.html' %} {% block title %}Import statement{% endblock %} {% block content %} diff --git a/drcr/templates/statements/import_preview.html b/drcr/templates/statements/import_preview.html index 60b5052..a67b0d1 100644 --- a/drcr/templates/statements/import_preview.html +++ b/drcr/templates/statements/import_preview.html @@ -15,7 +15,7 @@ along with this program. If not, see . #} -{% extends 'base_tailwind.html' %} +{% extends 'base.html' %} {% block title %}Import statement preview{% endblock %} {% block content %} diff --git a/drcr/templates/statements/statement_lines.html b/drcr/templates/statements/statement_lines.html index 428b89a..9eb885d 100644 --- a/drcr/templates/statements/statement_lines.html +++ b/drcr/templates/statements/statement_lines.html @@ -15,7 +15,7 @@ along with this program. If not, see . #} -{% extends 'base_tailwind.html' %} +{% extends 'base.html' %} {% block title %}Statement lines{% endblock %} {% block content %} diff --git a/drcr/templates/transactions.html b/drcr/templates/transactions.html index 48aca0c..1405f69 100644 --- a/drcr/templates/transactions.html +++ b/drcr/templates/transactions.html @@ -15,7 +15,7 @@ along with this program. If not, see . #} -{% extends 'base_tailwind.html' %} +{% extends 'base.html' %} {% block title %}Account transactions{% endblock %} {% block content %} diff --git a/drcr/templates/transactions_commodity_detail.html b/drcr/templates/transactions_commodity_detail.html index 48a7417..5084ff0 100644 --- a/drcr/templates/transactions_commodity_detail.html +++ b/drcr/templates/transactions_commodity_detail.html @@ -15,7 +15,7 @@ along with this program. If not, see . #} -{% extends 'base_tailwind.html' %} +{% extends 'base.html' %} {% block title %}Account transactions{% endblock %} {% block content %} diff --git a/drcr/templates/trial_balance.html b/drcr/templates/trial_balance.html index 3db5caf..17d5d6e 100644 --- a/drcr/templates/trial_balance.html +++ b/drcr/templates/trial_balance.html @@ -15,7 +15,7 @@ along with this program. If not, see . #} -{% extends 'base_tailwind.html' %} +{% extends 'base.html' %} {% block title %}Trial balance{% endblock %} {% block content %}