From 14cd5e9c0d2d1724158e24dc4411f69776a610fa Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Thu, 7 Aug 2025 23:19:32 +0200
Subject: [PATCH] refactor(template): reduce the amount of code in common
 templates

There is no need to have templates used only used in a single file be part of
every single other ones. This should reduce a bit the resident memory
consumption of miniflux.
---
 .../common/enclosure_media_controls.html      | 18 ---------
 .../templates/common/entry_pagination.html    | 19 ---------
 internal/template/templates/views/entry.html  | 39 +++++++++++++++++++
 3 files changed, 39 insertions(+), 37 deletions(-)
 delete mode 100644 internal/template/templates/common/enclosure_media_controls.html
 delete mode 100644 internal/template/templates/common/entry_pagination.html

diff --git a/internal/template/templates/common/enclosure_media_controls.html b/internal/template/templates/common/enclosure_media_controls.html
deleted file mode 100644
index 3f8c1cb2..00000000
--- a/internal/template/templates/common/enclosure_media_controls.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{{ define "enclosure_media_controls" }}
-<div class="media-controls">
-    <div class="media-seek-control">
-        <div class="media-control-label">{{ t "enclosure_media_controls.seek" }} </div>
-        <button class="page-button" data-enclosure-id="{{.ID}}" data-enclosure-action="seek" data-action-value="-30" title="{{ t "enclosure_media_controls.seek.title" "-30" }}" ><span class="icon-label" >-30s</span></button>
-        <button class="page-button" data-enclosure-id="{{.ID}}" data-enclosure-action="seek" data-action-value="-10" title="{{ t "enclosure_media_controls.seek.title" "-10" }}" ><span class="icon-label" >-10s</span></button>
-        <button class="page-button" data-enclosure-id="{{.ID}}" data-enclosure-action="seek" data-action-value="+10" title="{{ t "enclosure_media_controls.seek.title" "+10" }}" ><span class="icon-label" >+10s</span></button>
-        <button class="page-button" data-enclosure-id="{{.ID}}" data-enclosure-action="seek" data-action-value="+30" title="{{ t "enclosure_media_controls.seek.title" "+30" }}" ><span class="icon-label" >+30s</span></button>
-    </div>
-    <div class="media-speed-control">
-
-        <div class="media-control-label">{{ t "enclosure_media_controls.speed" }} (<span class="speed-indicator" data-enclosure-id="{{.ID}}">1.00x</span>)</div> <!-- Need JS to display the current speed unfortunately -->
-        <button class="page-button" data-enclosure-id="{{.ID}}" data-enclosure-action="speed" data-action-value="-0.25" title="{{ t "enclosure_media_controls.speed.slower.title" "0.25" }}"><span class="icon-label" >{{ t "enclosure_media_controls.speed.slower" }}</span></button>
-        <button class="page-button" data-enclosure-id="{{.ID}}" data-enclosure-action="speed-reset" data-action-value="1" title="{{ t "enclosure_media_controls.speed.reset.title"}}"><span class="icon-label" >{{ t "enclosure_media_controls.speed.reset" }}</span></button>
-        <button class="page-button" data-enclosure-id="{{.ID}}" data-enclosure-action="speed" data-action-value="+0.25" title="{{ t "enclosure_media_controls.speed.faster.title" "0.25" }}"><span class="icon-label" >{{ t "enclosure_media_controls.speed.faster" }}</span></button>
-    </div>
-</div>
-{{ end }}
diff --git a/internal/template/templates/common/entry_pagination.html b/internal/template/templates/common/entry_pagination.html
deleted file mode 100644
index ab63c7cc..00000000
--- a/internal/template/templates/common/entry_pagination.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{{ define "entry_pagination" }}
-<div class="pagination">
-    <div class="pagination-prev {{ if not .prevEntry }}disabled{{end}}">
-        {{ if .prevEntry }}
-            <a href="{{ .prevEntryRoute }}{{ if .searchQuery }}?q={{ .searchQuery }}{{ end }}" title="{{ .prevEntry.Title }}" data-page="previous" rel="prev">{{ t "pagination.previous" }}</a>
-        {{ else }}
-            {{ t "pagination.previous" }}
-        {{ end }}
-    </div>
-
-    <div class="pagination-next {{ if not .nextEntry }}disabled{{end}}">
-        {{ if .nextEntry }}
-            <a href="{{ .nextEntryRoute }}{{ if .searchQuery }}?q={{ .searchQuery }}{{ end }}" title="{{ .nextEntry.Title }}" data-page="next" rel="next">{{ t "pagination.next" }}</a>
-        {{ else }}
-            {{ t "pagination.next" }}
-        {{ end }}
-    </div>
-</div>
-{{ end }}
diff --git a/internal/template/templates/views/entry.html b/internal/template/templates/views/entry.html
index e5ef1967..a1d59296 100644
--- a/internal/template/templates/views/entry.html
+++ b/internal/template/templates/views/entry.html
@@ -1,5 +1,44 @@
 {{ define "title"}}{{ .entry.Title }}{{ end }}
 
+{{ define "entry_pagination" }}
+<div class="pagination">
+    <div class="pagination-prev {{ if not .prevEntry }}disabled{{end}}">
+        {{ if .prevEntry }}
+            <a href="{{ .prevEntryRoute }}{{ if .searchQuery }}?q={{ .searchQuery }}{{ end }}" title="{{ .prevEntry.Title }}" data-page="previous" rel="prev">{{ t "pagination.previous" }}</a>
+        {{ else }}
+            {{ t "pagination.previous" }}
+        {{ end }}
+    </div>
+
+    <div class="pagination-next {{ if not .nextEntry }}disabled{{end}}">
+        {{ if .nextEntry }}
+            <a href="{{ .nextEntryRoute }}{{ if .searchQuery }}?q={{ .searchQuery }}{{ end }}" title="{{ .nextEntry.Title }}" data-page="next" rel="next">{{ t "pagination.next" }}</a>
+        {{ else }}
+            {{ t "pagination.next" }}
+        {{ end }}
+    </div>
+</div>
+{{ end }}
+
+{{ define "enclosure_media_controls" }}
+<div class="media-controls">
+    <div class="media-seek-control">
+        <div class="media-control-label">{{ t "enclosure_media_controls.seek" }} </div>
+        <button class="page-button" data-enclosure-id="{{.ID}}" data-enclosure-action="seek" data-action-value="-30" title="{{ t "enclosure_media_controls.seek.title" "-30" }}" ><span class="icon-label" >-30s</span></button>
+        <button class="page-button" data-enclosure-id="{{.ID}}" data-enclosure-action="seek" data-action-value="-10" title="{{ t "enclosure_media_controls.seek.title" "-10" }}" ><span class="icon-label" >-10s</span></button>
+        <button class="page-button" data-enclosure-id="{{.ID}}" data-enclosure-action="seek" data-action-value="+10" title="{{ t "enclosure_media_controls.seek.title" "+10" }}" ><span class="icon-label" >+10s</span></button>
+        <button class="page-button" data-enclosure-id="{{.ID}}" data-enclosure-action="seek" data-action-value="+30" title="{{ t "enclosure_media_controls.seek.title" "+30" }}" ><span class="icon-label" >+30s</span></button>
+    </div>
+    <div class="media-speed-control">
+
+        <div class="media-control-label">{{ t "enclosure_media_controls.speed" }} (<span class="speed-indicator" data-enclosure-id="{{.ID}}">1.00x</span>)</div> <!-- Need JS to display the current speed unfortunately -->
+        <button class="page-button" data-enclosure-id="{{.ID}}" data-enclosure-action="speed" data-action-value="-0.25" title="{{ t "enclosure_media_controls.speed.slower.title" "0.25" }}"><span class="icon-label" >{{ t "enclosure_media_controls.speed.slower" }}</span></button>
+        <button class="page-button" data-enclosure-id="{{.ID}}" data-enclosure-action="speed-reset" data-action-value="1" title="{{ t "enclosure_media_controls.speed.reset.title"}}"><span class="icon-label" >{{ t "enclosure_media_controls.speed.reset" }}</span></button>
+        <button class="page-button" data-enclosure-id="{{.ID}}" data-enclosure-action="speed" data-action-value="+0.25" title="{{ t "enclosure_media_controls.speed.faster.title" "0.25" }}"><span class="icon-label" >{{ t "enclosure_media_controls.speed.faster" }}</span></button>
+    </div>
+</div>
+{{ end }}
+
 {{ define "page_header"}}
 <section class="entry" data-id="{{ .entry.ID }}" aria-labelledby="page-header-title">
     <header class="entry-header">