move some templates into one macro

2025-06-30 16:55:44 +03:00
parent ea5ecc3a9f
commit a95200caf9
4 changed files with 13 additions and 12 deletions
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -1,4 +1,4 @@
-{% from 'common/infobox.html' import infobox with context %}
+{% from 'common/macros.html' import infobox with context %}
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
--- a/app/templates/common/infobox.html
+++ b/app/templates/common/infobox.html
@@ -1,10 +0,0 @@
-{% macro infobox(message, kind=InfoboxKind.INFO) %}
-<div class="{{ "infobox " + InfoboxHTMLClass[kind] }}">
-  <span>
-  <div class="infobox-icon-container">
-    <img src="{{ InfoboxIcons[kind] }}">
-  </div>
-  {{ message }}
-  </span>
-</div>
-{% endmacro %}
--- a/app/templates/common/macros.html
+++ b/app/templates/common/macros.html
@@ -27,3 +27,14 @@
  {% endif %}
 </div>
 {% endmacro %}
+
+{% macro infobox(message, kind=InfoboxKind.INFO) %}
+<div class="{{ "infobox " + InfoboxHTMLClass[kind] }}">
+  <span>
+  <div class="infobox-icon-container">
+    <img src="{{ InfoboxIcons[kind] }}">
+  </div>
+  {{ message }}
+  </span>
+</div>
+{% endmacro %}
--- a/app/templates/topics/topic.html
+++ b/app/templates/topics/topic.html
@@ -1,4 +1,4 @@
-{% from 'common/pager.html' import pager %}
+{% from 'common/macros.html' import pager %}
 {% extends "base.html" %}
 {% block title %}browsing topic {{ topic['name'] }}{% endblock %}
 {% block content %}