From: <var...@us...> - 2013-04-02 15:34:50
|
Revision: 8740 http://sourceforge.net/p/phpwiki/code/8740 Author: vargenau Date: 2013-04-02 15:34:45 +0000 (Tue, 02 Apr 2013) Log Message: ----------- Use HTML 5 DOCTYPE; force CHARSET=utf-8 Modified Paths: -------------- trunk/themes/Crao/templates/navbar.tmpl trunk/themes/Crao/templates/signin.tmpl trunk/themes/MonoBook/templates/navbar.tmpl trunk/themes/Sidebar/templates/html.tmpl trunk/themes/Sidebar/templates/htmldump.tmpl trunk/themes/Sidebar/templates/search.tmpl trunk/themes/blog/templates/blogform.tmpl trunk/themes/default/templates/blogform.tmpl trunk/themes/default/templates/head.tmpl trunk/themes/default/templates/html.tmpl trunk/themes/default/templates/htmldump.tmpl trunk/themes/default/templates/redirect.tmpl trunk/themes/default/templates/search.tmpl trunk/themes/default/templates/signin.tmpl trunk/themes/fusionforge/templates/blogform.tmpl trunk/themes/shamino_com/templates/signin.tmpl trunk/themes/shamino_com/templates/top.tmpl trunk/themes/smaller/templates/navbar.tmpl trunk/themes/smaller/templates/signin.tmpl Modified: trunk/themes/Crao/templates/navbar.tmpl =================================================================== --- trunk/themes/Crao/templates/navbar.tmpl 2013-04-02 13:51:35 UTC (rev 8739) +++ trunk/themes/Crao/templates/navbar.tmpl 2013-04-02 15:34:45 UTC (rev 8740) @@ -1,6 +1,6 @@ <!-- The top navigation/search bar --> <form action="<?php echo WikiURL(_("TitleSearch"))?>" - method="get" accept-charset="<?php echo $charset?>" id="searchform"> + method="get" accept-charset="UTF-8" id="searchform"> <input type="hidden" name="auto_redirect" value="1" /> <?php if (! USE_PATH_INFO) { ?> <input type="hidden" name="pagename" value="<?php echo _("TitleSearch")?>" /> Modified: trunk/themes/Crao/templates/signin.tmpl =================================================================== --- trunk/themes/Crao/templates/signin.tmpl 2013-04-02 13:51:35 UTC (rev 8739) +++ trunk/themes/Crao/templates/signin.tmpl 2013-04-02 15:34:45 UTC (rev 8740) @@ -5,7 +5,7 @@ $NOFORM = true; ?> <?php if (empty($NOFORM)) { ?> - <form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="<?php echo $charset?>" name="<?php echo $FORMNAME?>"> + <form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="UTF-8" name="<?php echo $FORMNAME?>"> <?php echo HiddenInputs($request->getArgs(), false, array('auth')) ?> <?php } ?> <?php if ($user->isSignedIn()) { Modified: trunk/themes/MonoBook/templates/navbar.tmpl =================================================================== --- trunk/themes/MonoBook/templates/navbar.tmpl 2013-04-02 13:51:35 UTC (rev 8739) +++ trunk/themes/MonoBook/templates/navbar.tmpl 2013-04-02 15:34:45 UTC (rev 8740) @@ -29,7 +29,7 @@ 'type'=>'submit', 'value'=>_("Go"))))) ?> <!-- <form action="<?php echo WikiURL(_("TitleSearch"))?>" - method="get" accept-charset="<?php echo $charset?>"> + method="get" accept-charset="UTF-8"> <?php echo WikiLink(_("FindPage"), "searchButton",_("Search:")) ?> <input type="hidden" name="auto_redirect" value="1" /> <input type="text" name="s" size="12" maxlength="256" Modified: trunk/themes/Sidebar/templates/html.tmpl =================================================================== --- trunk/themes/Sidebar/templates/html.tmpl 2013-04-02 13:51:35 UTC (rev 8739) +++ trunk/themes/Sidebar/templates/html.tmpl 2013-04-02 15:34:45 UTC (rev 8740) @@ -2,10 +2,9 @@ /* * This template is responsible mainly for the outer level <html> stuff. */ -echo "<","?xml version=\"1.0\" encoding=\"", $charset, "\"?", ">\n"; -?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html <?php /* xmlns="http://www.w3.org/1999/xhtml" */ ?> xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>"> +?> +<!DOCTYPE html> +<html xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>"> <?php echo Template('head') ?> <?php echo Template('body') ?> </html> Modified: trunk/themes/Sidebar/templates/htmldump.tmpl =================================================================== --- trunk/themes/Sidebar/templates/htmldump.tmpl 2013-04-02 13:51:35 UTC (rev 8739) +++ trunk/themes/Sidebar/templates/htmldump.tmpl 2013-04-02 15:34:45 UTC (rev 8740) @@ -4,11 +4,10 @@ * mainly for the outer level <html> stuff and the and <head>. */ ?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html> <html xmlns="http://www.w3.org/1999/xhtml"> <head> -<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset?>" /> +<meta charset="UTF-8" /> <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" /> <link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL(_("HowToUseWiki"))?>" /> <link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" /> Modified: trunk/themes/Sidebar/templates/search.tmpl =================================================================== --- trunk/themes/Sidebar/templates/search.tmpl 2013-04-02 13:51:35 UTC (rev 8739) +++ trunk/themes/Sidebar/templates/search.tmpl 2013-04-02 15:34:45 UTC (rev 8740) @@ -1,7 +1,7 @@ <!--{{{ LiveSearch --> <div id="searchholder"> <form id="searchform" action="<?php echo WikiURL(_("FindPage"))?>" - method="get" accept-charset="<?php echo $charset?>" style="display:inline" class="searchform"> + method="get" accept-charset="UTF-8" style="display:inline" class="searchform"> <?php $s = $request->getArg('s') ? $request->getArg('s') : _("Search"); $p = $WikiTheme->tooltipAccessKeyPrefix(); Modified: trunk/themes/blog/templates/blogform.tmpl =================================================================== --- trunk/themes/blog/templates/blogform.tmpl 2013-04-02 13:51:35 UTC (rev 8739) +++ trunk/themes/blog/templates/blogform.tmpl 2013-04-02 15:34:45 UTC (rev 8740) @@ -1,6 +1,6 @@ <div class="wikiblog wikiblog-form"> <form action="<?php echo $request->getPostURL()?>" method="post" name="editpage" - accept-charset="<?php echo $charset?>" id="wikiblog-form"> + accept-charset="UTF-8" id="wikiblog-form"> <input type="hidden" name="edit[pagename]" value="<?php echo $PAGENAME?>" /> <input type="hidden" name="mode" value="add" /> <div class="wikiblog-form"> Modified: trunk/themes/default/templates/blogform.tmpl =================================================================== --- trunk/themes/default/templates/blogform.tmpl 2013-04-02 13:51:35 UTC (rev 8739) +++ trunk/themes/default/templates/blogform.tmpl 2013-04-02 15:34:45 UTC (rev 8740) @@ -1,6 +1,6 @@ <div class="wikiblog wikiblog-form"> <form action="<?php echo $request->getPostURL()?>" method="post" name="editpage" - accept-charset="<?php echo $charset?>" id="wikiblog-form"> + accept-charset="UTF-8" id="wikiblog-form"> <input type="hidden" name="edit[pagename]" value="<?php echo $PAGENAME?>" /> <input type="hidden" name="mode" value="add" /> <div class="wikiblog-form"> Modified: trunk/themes/default/templates/head.tmpl =================================================================== --- trunk/themes/default/templates/head.tmpl 2013-04-02 13:51:35 UTC (rev 8739) +++ trunk/themes/default/templates/head.tmpl 2013-04-02 15:34:45 UTC (rev 8740) @@ -1,8 +1,8 @@ <head> <?php if (ENABLE_XHTML_XML and strstr($request->get('HTTP_ACCEPT'),'application/xhtml+xml')) { ?> -<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=<?php echo $charset?>" /> +<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" /> <?php } else { ?> -<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset?>" /> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <?php } ?> <meta http-equiv="Content-Style-Type" content="text/css" /> <meta http-equiv="Content-Language" content="<?php echo $GLOBALS['LANG']?>" /> Modified: trunk/themes/default/templates/html.tmpl =================================================================== --- trunk/themes/default/templates/html.tmpl 2013-04-02 13:51:35 UTC (rev 8739) +++ trunk/themes/default/templates/html.tmpl 2013-04-02 15:34:45 UTC (rev 8740) @@ -2,10 +2,9 @@ /* * This template is responsible mainly for the outer level <html> stuff. */ -echo "<","?xml version=\"1.0\" encoding=\"", $charset, "\"?", ">\n"; -?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>"> +?> +<!DOCTYPE html> +<html xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>"> <?php echo Template('head') ?> <?php echo Template('body') ?> </html> Modified: trunk/themes/default/templates/htmldump.tmpl =================================================================== --- trunk/themes/default/templates/htmldump.tmpl 2013-04-02 13:51:35 UTC (rev 8739) +++ trunk/themes/default/templates/htmldump.tmpl 2013-04-02 15:34:45 UTC (rev 8740) @@ -8,7 +8,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> -<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset?>" /> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" /> <link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL(_("HowToUseWiki"))?>" /> <link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" /> Modified: trunk/themes/default/templates/redirect.tmpl =================================================================== --- trunk/themes/default/templates/redirect.tmpl 2013-04-02 13:51:35 UTC (rev 8739) +++ trunk/themes/default/templates/redirect.tmpl 2013-04-02 15:34:45 UTC (rev 8740) @@ -2,10 +2,9 @@ /* * Redirect output. */ -echo "<","?xml version=\"1.0\" encoding=\"", $charset, "\"?", ">\n"; -?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> +?> +<!DOCTYPE html> +<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta name="robots" content="noindex, nofollow" /> Modified: trunk/themes/default/templates/search.tmpl =================================================================== --- trunk/themes/default/templates/search.tmpl 2013-04-02 13:51:35 UTC (rev 8739) +++ trunk/themes/default/templates/search.tmpl 2013-04-02 15:34:45 UTC (rev 8740) @@ -1,7 +1,7 @@ <!--{{{ LiveSearch --> <?php // -*- php -*- ?> <div id="searchholder"> <form id="searchform" action="<?php echo WikiURL(_("TitleSearch"))?>" - method="get" accept-charset="<?php echo $charset?>" style="display:inline" class="searchform"> + method="get" accept-charset="UTF-8" style="display:inline" class="searchform"> <?php $s = $request->getArg('s') ? $request->getArg('s') : _("Search"); $p = $WikiTheme->tooltipAccessKeyPrefix(); Modified: trunk/themes/default/templates/signin.tmpl =================================================================== --- trunk/themes/default/templates/signin.tmpl 2013-04-02 13:51:35 UTC (rev 8739) +++ trunk/themes/default/templates/signin.tmpl 2013-04-02 15:34:45 UTC (rev 8740) @@ -5,7 +5,7 @@ $NOFORM = true; ?> <?php if (empty($NOFORM)) { ?> - <form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="<?php echo $charset?>" name="<?php echo $FORMNAME?>"> + <form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="UTF-8" name="<?php echo $FORMNAME?>"> <?php echo HiddenInputs($request->getArgs(), false, array('auth')) ?> <?php } ?> <?php Modified: trunk/themes/fusionforge/templates/blogform.tmpl =================================================================== --- trunk/themes/fusionforge/templates/blogform.tmpl 2013-04-02 13:51:35 UTC (rev 8739) +++ trunk/themes/fusionforge/templates/blogform.tmpl 2013-04-02 15:34:45 UTC (rev 8740) @@ -1,6 +1,6 @@ <div class="wikiblog wikiblog-form"> <form action="<?php echo $request->getPostURL()?>" method="post" name="editpage" - accept-charset="<?php echo $charset?>" id="wikiblog-form"> + accept-charset="UTF-8" id="wikiblog-form"> <input type="hidden" name="edit[pagename]" value="<?php echo $PAGENAME?>" /> <input type="hidden" name="mode" value="add" /> <div class="wikiblog-form"> Modified: trunk/themes/shamino_com/templates/signin.tmpl =================================================================== --- trunk/themes/shamino_com/templates/signin.tmpl 2013-04-02 13:51:35 UTC (rev 8739) +++ trunk/themes/shamino_com/templates/signin.tmpl 2013-04-02 15:34:45 UTC (rev 8740) @@ -6,7 +6,7 @@ $NOFORM = true; ?> <?php if (empty($NOFORM)) { ?> - <form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="<?php echo $charset?>" name="<?php echo $FORMNAME?>"> + <form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="UTF-8" name="<?php echo $FORMNAME?>"> <?php echo HiddenInputs($request->getArgs(), false, array('auth')) ?> <?php } if ($user->isAuthenticated()) { Modified: trunk/themes/shamino_com/templates/top.tmpl =================================================================== --- trunk/themes/shamino_com/templates/top.tmpl 2013-04-02 13:51:35 UTC (rev 8739) +++ trunk/themes/shamino_com/templates/top.tmpl 2013-04-02 15:34:45 UTC (rev 8740) @@ -13,7 +13,7 @@ <?php echo $HEADER ?> <?php if (empty($GLOBALS['HIDE_TOOLBARS'])) { ?> - <form action="<?php echo WikiURL(_("TitleSearch"))?>" - method="get" accept-charset="<?php echo $charset?>" style="display: inline"> + method="get" accept-charset="UTF-8" style="display: inline"> <a class="wikilink" href="<?php echo WikiURL(_("RecentChanges"))?>"><?php echo _("RecentChanges")?></a> - <a class="wikilink" href="<?php echo WikiURL(_("FindPage"))?>"><?php echo _("FindPage")?>:</a> <input type="hidden" name="auto_redirect" value="1" /> Modified: trunk/themes/smaller/templates/navbar.tmpl =================================================================== --- trunk/themes/smaller/templates/navbar.tmpl 2013-04-02 13:51:35 UTC (rev 8739) +++ trunk/themes/smaller/templates/navbar.tmpl 2013-04-02 15:34:45 UTC (rev 8740) @@ -1,6 +1,6 @@ <!-- The top navigation/search bar --> <form action="<?php echo WikiURL(_("TitleSearch"))?>" - method="get" accept-charset="<?php echo $charset?>"> + method="get" accept-charset="UTF-8"> <div id="navbuttons"> <?php echo WikiLink(_("RecentChanges"), "","News") ?> <?php echo $SEP?><?php echo WikiLink(_("FindPage"), "","Search:") ?> Modified: trunk/themes/smaller/templates/signin.tmpl =================================================================== --- trunk/themes/smaller/templates/signin.tmpl 2013-04-02 13:51:35 UTC (rev 8739) +++ trunk/themes/smaller/templates/signin.tmpl 2013-04-02 15:34:45 UTC (rev 8740) @@ -5,7 +5,7 @@ $NOFORM = true; ?> <?php if (empty($NOFORM)) { ?> - <form style="display:inline" method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="<?php echo $charset?>" name="<?php echo $FORMNAME?>"> + <form style="display:inline" method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="UTF-8" name="<?php echo $FORMNAME?>"> <?php echo HiddenInputs($request->getArgs(), false, array('auth')) ?> <?php } ?> <?php This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |