Fix that an empty line was inserted before <!doctype html>

2026-01-05 16:29:52 -06:00 · 2025-03-28 22:39:06 +01:00
parent 0fba1230f7
commit d82303f96f
14 changed files with 14 additions and 27 deletions
--- a/internal/webserver/web/templates/html_admin.tmpl
+++ b/internal/webserver/web/templates/html_admin.tmpl
@@ -1,5 +1,4 @@
-{{ define "admin" }}
-{{ template "header" . }}
+{{ define "admin" }}{{ template "header" . }}
 
      <div class="row">
        <div class="col">
--- a/internal/webserver/web/templates/html_api.tmpl
+++ b/internal/webserver/web/templates/html_api.tmpl
@@ -1,5 +1,4 @@
-{{ define "api" }}
-{{ template "header" . }}
+{{ define "api" }}{{ template "header" . }}
 <div class="row">
    <div class="col">
        <div id="container" class="card" style="width: 80%">
--- a/internal/webserver/web/templates/html_changepw.tmpl
+++ b/internal/webserver/web/templates/html_changepw.tmpl
@@ -1,5 +1,4 @@
-{{define "changepw"}}
-{{ template "header" . }} 
+{{define "changepw"}}{{ template "header" . }} 
      <div class="row">
        <div class="col">
 		<div id="container" class="card" style="width: 25em">
--- a/internal/webserver/web/templates/html_download.tmpl
+++ b/internal/webserver/web/templates/html_download.tmpl
@@ -1,5 +1,4 @@
-{{define "download"}}
-{{template "header" .}}
+{{define "download"}}{{template "header" .}}
 
      <div class="row">
        <div class="col">
--- a/internal/webserver/web/templates/html_download_password.tmpl
+++ b/internal/webserver/web/templates/html_download_password.tmpl
@@ -1,5 +1,4 @@
-{{define "download_password"}}
-{{template "header" .}}
+{{define "download_password"}}{{template "header" .}}
 
 {{ if .EndToEndEncryption }}
 <script>
--- a/internal/webserver/web/templates/html_end2end.tmpl
+++ b/internal/webserver/web/templates/html_end2end.tmpl
@@ -1,5 +1,4 @@
-{{define "e2esetup"}}
-{{template "header" .}}
+{{define "e2esetup"}}{{template "header" .}}

 
 	<script src="./js/min/end2end_admin.min.{{ template "js_e2eversion"}}.js"></script>
--- a/internal/webserver/web/templates/html_error.tmpl
+++ b/internal/webserver/web/templates/html_error.tmpl
@@ -1,5 +1,4 @@
-{{define "error"}}
-{{template "header" .}}
+{{define "error"}}{{template "header" .}}
 
      <div class="row">
        <div class="col">
--- a/internal/webserver/web/templates/html_error_auth.tmpl
+++ b/internal/webserver/web/templates/html_error_auth.tmpl
@@ -1,5 +1,4 @@
-{{define "error_auth"}}
-{{template "header" .}}
+{{define "error_auth"}}{{template "header" .}}
 
      <div class="row">
        <div class="col">
--- a/internal/webserver/web/templates/html_error_header.tmpl
+++ b/internal/webserver/web/templates/html_error_header.tmpl
@@ -1,5 +1,4 @@
-{{define "error_auth_header"}}
-{{template "header" .}}
+{{define "error_auth_header"}}{{template "header" .}}
 
      <div class="row">
        <div class="col">
--- a/internal/webserver/web/templates/html_error_int_oauth.tmpl
+++ b/internal/webserver/web/templates/html_error_int_oauth.tmpl
@@ -1,5 +1,4 @@
-{{define "error_int_oauth"}}
-{{template "header" .}}
+{{define "error_int_oauth"}}{{template "header" .}}

      <div class="row">
        <div class="col">
--- a/internal/webserver/web/templates/html_forgotpw.tmpl
+++ b/internal/webserver/web/templates/html_forgotpw.tmpl
@@ -1,5 +1,4 @@
-{{define "forgotpw"}}
-{{ template "header" . }} 
+{{define "forgotpw"}}{{ template "header" . }} 
      <div class="row">
        <div class="col">
 		<div id="container" class="card" style="width: 35em">
--- a/internal/webserver/web/templates/html_login.tmpl
+++ b/internal/webserver/web/templates/html_login.tmpl
@@ -1,5 +1,4 @@
-{{define "login"}}
-{{ template "header" . }} 
+{{define "login"}}{{ template "header" . }} 
      <div class="row">
        <div class="col">
 		<div id="container" class="card" style="width: 20em">
--- a/internal/webserver/web/templates/html_logs.tmpl
+++ b/internal/webserver/web/templates/html_logs.tmpl
@@ -1,5 +1,4 @@
-{{ define "logs" }}
-{{ template "header" . }}
+{{ define "logs" }}{{ template "header" . }}
 <div class="row">
    <div class="col">
        <div id="container" class="card" style="width: 80%">
--- a/internal/webserver/web/templates/html_redirect_filename.tmpl
+++ b/internal/webserver/web/templates/html_redirect_filename.tmpl
@@ -1,4 +1,4 @@
-{{define "redirect_filename"}}
+{{define "redirect_filename"}}<!doctype html>
 <html><head>

       {{ if .PasswordRequired }}