Item12993: adjusting charset definition to doctype

foswiki · Dec 1, 2014 · 3884208 · 3884208
1 parent b53d54c
commit 3884208
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/ConfigurePlugin/templates/configure.tmpl b/ConfigurePlugin/templates/configure.tmpl
@@ -8,7 +8,7 @@ configure.js script.
 }%<!DOCTYPE html>
 <html lang="en">
  <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta charset="utf-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <title>Foswiki Configuration</title>
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.5, user-scalable=yes" />

diff --git a/PatternSkin/templates/foswiki.pattern.tmpl b/PatternSkin/templates/foswiki.pattern.tmpl
@@ -43,7 +43,7 @@
 %TMPL:P{"head:meta"}%%RENDERZONE{"head"}%%TMPL:P{"head:css"}%%TMPL:P{"head:script"}%%RENDERZONE{"script"}%</head>%TMPL:END%
 
 %TMPL:DEF{"head:meta"}%<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta http-equiv="Content-Type" content="text/html; charset=%CHARSET%" />
+<meta charset="%CHARSET%" />
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.5, user-scalable=yes" />
 <meta name="mobile-web-app-capable" content="yes" />
 <meta name="mobile-web-app-status-bar-style" content="black-translucent" />

diff --git a/core/templates/foswiki.tmpl b/core/templates/foswiki.tmpl
@@ -64,19 +64,19 @@ JQUERYPLUGIN is not a hard requirement, but it must sort earlier.
 }%%TMPL:DEF{"windowtitle"}%<title>%TMPL:P{"titleaction"}% <nop>%BASETOPIC%%TMPL:P{"titlesep"}%%BASEWEB%%TMPL:P{"titlesep"}%<nop>%WIKITOOLNAME%</title>%TMPL:END%%{
 ---------------------------------------------------
 }%%TMPL:DEF{"head"}%<head>
-	%TMPL:P{"windowtitle"}%
-	<meta http-equiv="Content-Type" content="text/html; charset=%CHARSET%" /> <meta name="robots" content="noindex" /> 
+%TMPL:P{"windowtitle"}%
+        <meta charset=%CHARSET%" /> <meta name="robots" content="noindex" />
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.5, user-scalable=yes" />
         <meta name="mobile-web-app-capable" content="yes" />
         <meta name="mobile-web-app-status-bar-style" content="black-translucent" />
         <meta name="apple-mobile-web-app-capable" content="yes" />
         <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> %HTTP_EQUIV_ON_VIEW%
-	<link rel="icon" href="%FAVICON%" type="image/x-icon" /> <link rel="shortcut icon" href="%FAVICON%" type="image/x-icon" />
-	<link rel="alternate" href="%SCRIPTURL{edit}%/%BASEWEB%/%BASETOPIC%?t=%GMTIME{"$epoch"}%" type="application/x-wiki" title="edit %BASETOPIC%" />
-	<meta name="description" content="%TOPIC%" />
+<link rel="icon" href="%FAVICON%" type="image/x-icon" /> <link rel="shortcut icon" href="%FAVICON%" type="image/x-icon" />
+<link rel="alternate" href="%SCRIPTURL{edit}%/%BASEWEB%/%BASETOPIC%?t=%GMTIME{"$epoch"}%" type="application/x-wiki" title="edit %BASETOPIC%" />
+<meta name="description" content="%TOPIC%" />
     <base href="%SCRIPTURL{%SCRIPTNAME%}%/%WEB%/%TOPIC%" /><!--[if IE]></base><![endif]-->
-	%TMPL:P{"script"}%
-	%TMPL:P{"defaultstyle"}%
+%TMPL:P{"script"}%
+%TMPL:P{"defaultstyle"}%
 </head>%TMPL:END%%{
 ---------------------------------------------------
 }%%TMPL:DEF{"titleaction"}%%TMPL:END%%{