From 17ec6095d6cc48a3d5b76bc458744eed0880ac33 Mon Sep 17 00:00:00 2001
From: Gaspard Beernaert <gaspard@gmail.com>
Date: Wed, 17 Jun 2020 00:45:35 +0200
Subject: [PATCH] Web: remove legacy xhtml syntax (#1723)

---
 modules/data/webadmin/tmpl/add_edit_network.tmpl | 4 ++--
 modules/data/webadmin/tmpl/add_edit_user.tmpl    | 4 ++--
 modules/data/webadmin/tmpl/settings.tmpl         | 4 ++--
 webskins/_default_/pub/_default_.css             | 4 ++++
 webskins/_default_/tmpl/BaseHeader.tmpl          | 2 +-
 webskins/_default_/tmpl/DocType.tmpl             | 1 -
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/modules/data/webadmin/tmpl/add_edit_network.tmpl b/modules/data/webadmin/tmpl/add_edit_network.tmpl
index ae66a35d..93312b57 100644
--- a/modules/data/webadmin/tmpl/add_edit_network.tmpl
+++ b/modules/data/webadmin/tmpl/add_edit_network.tmpl
@@ -249,7 +249,7 @@
 							<? ENDIF ?>
 						</td>
 						<td class="mod_descr"><? VAR Description ?></td>
-						<td align="center">
+						<td class="center">
 							<? IF CanBeLoadedGlobally ?>
 								<input type="checkbox" name="loaded_globally" id="loaded_globally_<? VAR Name ?>"
 								<? IF LoadedGlobally ?>
@@ -258,7 +258,7 @@
 								disabled="disabled"/>
 							<? ENDIF ?>
 						</td>
-						<td align="center">
+						<td class="center">
 							<? IF CanBeLoadedByUser ?>
 								<input type="checkbox" name="loaded_by_user" id="loaded_by_user_<? VAR Name ?>"
 								<? IF LoadedByUser ?>
diff --git a/modules/data/webadmin/tmpl/add_edit_user.tmpl b/modules/data/webadmin/tmpl/add_edit_user.tmpl
index 3178ca75..5e695795 100644
--- a/modules/data/webadmin/tmpl/add_edit_user.tmpl
+++ b/modules/data/webadmin/tmpl/add_edit_user.tmpl
@@ -195,7 +195,7 @@
 							<? ENDIF ?>
 						</td>
 						<td class="mod_descr"><? VAR Description ?></td>
-						<td align="center">
+						<td class="center">
 							<? IF CanBeLoadedGlobally ?>
 								<input type="checkbox" name="loaded_globally" id="loaded_globally_<? VAR Name ?>"
 								<? IF LoadedGlobally ?>
@@ -204,7 +204,7 @@
 								disabled="disabled"/>
 							<? ENDIF ?>	
 						</td>
-						<td align="center">
+						<td class="center">
 							<? IF CanBeLoadedByNetwork ?>
 								<input type="checkbox" name="loaded_by_network" id="loaded_by_net_<? VAR Name ?>"
 								<? IF LoadedBySomeNetworks && LoadedByAllNetworks ?>
diff --git a/modules/data/webadmin/tmpl/settings.tmpl b/modules/data/webadmin/tmpl/settings.tmpl
index df292d05..5412ad18 100644
--- a/modules/data/webadmin/tmpl/settings.tmpl
+++ b/modules/data/webadmin/tmpl/settings.tmpl
@@ -197,7 +197,7 @@
 							<? IF ArgsHelpText ?> title="<? VAR ArgsHelpText ?>"<? ENDIF ?> />
 						</td>
 						<td class="mod_descr"><? VAR Description ?></td>
-						<td align="center">
+						<td class="center">
 							<? IF CanBeLoadedByNetwork ?>
 								<input type="checkbox" name="loaded_by_network" id="loaded_by_net_<? VAR Name ?>"
 								<? IF LoadedBySomeNetworks && LoadedByAllNetworks ?>
@@ -211,7 +211,7 @@
 								<? ENDIF ?>
 							<? ENDIF ?>
 						</td>
-						<td align="center">
+						<td class="center">
 							<? IF CanBeLoadedByUser ?>
 								<input type="checkbox" name="loaded_by_user" id="loaded_by_user_<? VAR Name ?>"
 								<? IF LoadedBySomeUsers && LoadedByAllUsers ?>
diff --git a/webskins/_default_/pub/_default_.css b/webskins/_default_/pub/_default_.css
index d7c9f6d1..e1cae329 100644
--- a/webskins/_default_/pub/_default_.css
+++ b/webskins/_default_/pub/_default_.css
@@ -363,6 +363,10 @@ td.mod_name,
 	white-space: nowrap;
 }
 
+td.center {
+	text-align: center;
+}
+
 .lotsofcheckboxes .checkboxandlabel {
 	display: block;
 	float: left;
diff --git a/webskins/_default_/tmpl/BaseHeader.tmpl b/webskins/_default_/tmpl/BaseHeader.tmpl
index 10c47e1f..7d7b69b0 100644
--- a/webskins/_default_/tmpl/BaseHeader.tmpl
+++ b/webskins/_default_/tmpl/BaseHeader.tmpl
@@ -6,7 +6,7 @@
 <? AddRow JSLoop HREF=/pub/selectize-standalone-0.12.1.min.js ?>
 <? AddRow CSSLoop HREF=/pub/jquery-ui-sortable.1.11.4.min.css ?>
 <? AddRow CSSLoop HREF=/pub/selectize-0.12.1.css ?>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html lang="en">
 	<head>
 		<meta charset="UTF-8" />
 		<title>ZNC - <? VAR Title DEFAULT="Web Frontend" ?></title>
diff --git a/webskins/_default_/tmpl/DocType.tmpl b/webskins/_default_/tmpl/DocType.tmpl
index 9bc09d12..0e76edd6 100644
--- a/webskins/_default_/tmpl/DocType.tmpl
+++ b/webskins/_default_/tmpl/DocType.tmpl
@@ -1,2 +1 @@
-<? LT ?>xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html>