Skip to content

Commit

Permalink
[fc] Repository: plone.reload
Browse files Browse the repository at this point in the history 
Branch: refs/heads/master
Date: 2021-10-07T16:36:07+02:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: plone/plone.reload@a37979f

Fix missing doctype, add html lang, use html5 charset to reload page.

Files changed:
M CHANGES.rst
M plone/reload/reload.pt
Repository: plone.reload

Branch: refs/heads/master
Date: 2021-10-13T14:22:34+02:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: plone/plone.reload@4de12ac

Merge pull request #15 from plone/thet-html5-meta-charset

Fix missing doctype, add html lang, use html5 charset to reload page.

Files changed:
M CHANGES.rst
M plone/reload/reload.pt
  • Loading branch information
@thet
thet committed Oct 13, 2021
1 parent 7c1692f commit 48580d4
Showing 1 changed file with 17 additions and 19 deletions.
36 changes: 17 additions & 19 deletions last_commit.txt
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,34 @@
Repository: Products.CMFPlone
Repository: plone.reload


Branch: refs/heads/master
Date: 2021-10-13T14:17:48+02:00
Author: Malthe Borch (malthe) <mborch@gmail.com>
Commit: https://github.com/plone/Products.CMFPlone/commit/2ed6aeb21edb2809cfc08506f32d251f35e25618

Use HTML5 meta charset
Date: 2021-10-07T16:36:07+02:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: https://github.com/plone/plone.reload/commit/a37979fb04bccf73c1306f716315334d920796a0

Using http-equiv is no longer the only way to specify the character set of an HTML document.
Fix missing doctype, add html lang, use html5 charset to reload page.

Files changed:
A news/2025.bugfix
M Products/CMFPlone/browser/templates/ajax_main_template.pt
M Products/CMFPlone/browser/templates/main_template.pt
M Products/CMFPlone/browser/templates/plone-frontpage.pt
M CHANGES.rst
M plone/reload/reload.pt

b'diff --git a/Products/CMFPlone/browser/templates/ajax_main_template.pt b/Products/CMFPlone/browser/templates/ajax_main_template.pt\nindex 279d53c10e..3f8ef8bc10 100644\n--- a/Products/CMFPlone/browser/templates/ajax_main_template.pt\n+++ b/Products/CMFPlone/browser/templates/ajax_main_template.pt\n@@ -24,7 +24,7 @@\n <metal:cache tal:replace="structure provider:plone.httpheaders" />\n \n <head>\n- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n+ <meta charset="utf-8" />\n \n <tal:ajaxhead condition="ajax_include_head">\n <div tal:replace="structure provider:plone.htmlhead" />\ndiff --git a/Products/CMFPlone/browser/templates/main_template.pt b/Products/CMFPlone/browser/templates/main_template.pt\nindex 333ee0a205..dac3b37cd9 100644\n--- a/Products/CMFPlone/browser/templates/main_template.pt\n+++ b/Products/CMFPlone/browser/templates/main_template.pt\n@@ -24,7 +24,7 @@\n <metal:cache tal:replace="structure provider:plone.httpheaders" />\n \n <head>\n- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n+ <meta charset="utf-8" />\n \n <div tal:replace="structure provider:plone.htmlhead" />\n \ndiff --git a/Products/CMFPlone/browser/templates/plone-frontpage.pt b/Products/CMFPlone/browser/templates/plone-frontpage.pt\nindex d04d845f15..d4bc06ba80 100644\n--- a/Products/CMFPlone/browser/templates/plone-frontpage.pt\n+++ b/Products/CMFPlone/browser/templates/plone-frontpage.pt\n@@ -4,7 +4,7 @@\n i18n:domain="plonefrontpage">\n \n <head>\n- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n+ <meta charset="utf-8" />\n </head>\n \n <body i18n:translate="front-text">\ndiff --git a/news/2025.bugfix b/news/2025.bugfix\nnew file mode 100644\nindex 0000000000..2a4cfaf3df\n--- /dev/null\n+++ b/news/2025.bugfix\n@@ -0,0 +1,2 @@\n+Use HTML5 meta charset.\n+[malthe]\n'
b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 6d15e70..e8a85a8 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -14,7 +14,8 @@ New features:\n \n Bug fixes:\n \n-- *add item here*\n+- Fix missing doctype, add html lang, use html5 charset to reload page.\n+ [thet]\n \n \n 3.0.1 (2020-04-22)\ndiff --git a/plone/reload/reload.pt b/plone/reload/reload.pt\nindex 343b5e9..215460f 100644\n--- a/plone/reload/reload.pt\n+++ b/plone/reload/reload.pt\n@@ -1,10 +1,9 @@\n-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"\n- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\n-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"\n+<tal:doctype tal:replace="structure string:&lt;!DOCTYPE html&gt;" />\n+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"\n xmlns:tal="http://xml.zope.org/namespaces/tal">\n <head>\n <title>plone.reload</title>\n- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n+ <meta charset="utf-8" />\n </head>\n <body>\n \n'

Repository: Products.CMFPlone
Repository: plone.reload


Branch: refs/heads/master
Date: 2021-10-13T14:17:48+02:00
Date: 2021-10-13T14:22:34+02:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: https://github.com/plone/Products.CMFPlone/commit/75a45a2ca50df8900a4203c3bb9220dec1eb220f
Commit: https://github.com/plone/plone.reload/commit/4de12ac3ecedb47dc9d589769d417bfba9d05358

Merge pull request #15 from plone/thet-html5-meta-charset

Define doctype where it isn't.
Fix missing doctype, add html lang, use html5 charset to reload page.

Files changed:
M Products/CMFPlone/browser/templates/plone-frontpage.pt
M Products/CMFPlone/www/addPropertySheet.zpt
M CHANGES.rst
M plone/reload/reload.pt

b'diff --git a/Products/CMFPlone/browser/templates/plone-frontpage.pt b/Products/CMFPlone/browser/templates/plone-frontpage.pt\nindex d4bc06ba80..badf8795fe 100644\n--- a/Products/CMFPlone/browser/templates/plone-frontpage.pt\n+++ b/Products/CMFPlone/browser/templates/plone-frontpage.pt\n@@ -1,3 +1,4 @@\n+<tal:doctype tal:replace="structure string:&lt;!DOCTYPE html&gt;" />\n <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"\n xmlns:i18n="http://xml.zope.org/namespaces/i18n"\n lang="en"\ndiff --git a/Products/CMFPlone/www/addPropertySheet.zpt b/Products/CMFPlone/www/addPropertySheet.zpt\nindex 33287009f0..2d01f3bcda 100644\n--- a/Products/CMFPlone/www/addPropertySheet.zpt\n+++ b/Products/CMFPlone/www/addPropertySheet.zpt\n@@ -1,4 +1,4 @@\n-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">\n+<tal:doctype tal:replace="structure string:&lt;!DOCTYPE html&gt;" />\n <html>\n <head>\n <meta http-equiv="content-type" content="text/html;charset=utf-8"\n'
b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 6d15e70..e8a85a8 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -14,7 +14,8 @@ New features:\n \n Bug fixes:\n \n-- *add item here*\n+- Fix missing doctype, add html lang, use html5 charset to reload page.\n+ [thet]\n \n \n 3.0.1 (2020-04-22)\ndiff --git a/plone/reload/reload.pt b/plone/reload/reload.pt\nindex 343b5e9..215460f 100644\n--- a/plone/reload/reload.pt\n+++ b/plone/reload/reload.pt\n@@ -1,10 +1,9 @@\n-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"\n- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\n-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"\n+<tal:doctype tal:replace="structure string:&lt;!DOCTYPE html&gt;" />\n+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"\n xmlns:tal="http://xml.zope.org/namespaces/tal">\n <head>\n <title>plone.reload</title>\n- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n+ <meta charset="utf-8" />\n </head>\n <body>\n \n'

0 comments on commit 48580d4

Please sign in to comment.