update meta charset tag to html5 standard in remaining views

exponentcms · Dec 11, 2016 · 9df16e8 · 9df16e8
1 parent 5352b27
commit 9df16e8
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 11 deletions.
diff --git a/framework/core/views/_maintenance.tpl b/framework/core/views/_maintenance.tpl
@@ -16,9 +16,10 @@
 <!DOCTYPE HTML>
 <html>
     <head>
-        <meta http-equiv="Content-Type" content="text/html; charset={$smarty.const.LANG_CHARSET}"/>
-        <meta name="Generator" content="Exponent Content Management System - v{expVersion::getVersion(true)}"/>
+        {*<meta http-equiv="Content-Type" content="text/html; charset={$smarty.const.LANG_CHARSET}"/>*}
+        <meta charset="{$smarty.const.LANG_CHARSET}">
         <title>{$smarty.const.SITE_TITLE} :: {'Down for Maintenance.'|gettext}</title>
+        <meta name="Generator" content="Exponent Content Management System - v{expVersion::getVersion(true)}"/>
         <style type="text/css" media="screen">
             html {
                 background : #397993;

diff --git a/framework/core/views/orphaned_content.tpl b/framework/core/views/orphaned_content.tpl
@@ -16,8 +16,9 @@
 <!DOCTYPE HTML>
 <html>
 	<head>
-		<title>{$smarty.const.SITE_TITLE} -- {'Archived Content'|gettext}</title>
-		<meta http-equiv="Content-Type" content="text/html; charset={$smarty.const.LANG_CHARSET}" />
+		{*<meta http-equiv="Content-Type" content="text/html; charset={$smarty.const.LANG_CHARSET}" />*}
+        <meta charset="{$smarty.const.LANG_CHARSET}">
+        <title>{$smarty.const.SITE_TITLE} -- {'Archived Content'|gettext}</title>
         <meta name="Generator" content="Exponent Content Management System - v{expVersion::getVersion(true)}"/>
 		<link rel="stylesheet" href="{$smarty.const.THEME_RELATIVE}style.css" />
 		<link rel="stylesheet" href="{$smarty.const.THEME_RELATIVE}editor.css" />

diff --git a/framework/modules/navigation/views/navigation/manage_redirection_log.tpl b/framework/modules/navigation/views/navigation/manage_redirection_log.tpl
@@ -32,7 +32,7 @@
 {/css}
 
 <div class="module navigation manage-redirection-log">
-    <h2>{'Page Redirection Log'|gettext}</h2>
+    <h1>{'Page Redirection Log'|gettext}</h1>
     {if $page->total_records}{icon class="delete" action=delete_redirection_log text='Delete Page Redirection Log'|gettext onclick="return confirm('"|cat:("Delete the entire log?"|gettext)|cat:"');"}{/if}
     {$page->links}
     {*<div class="exp-ecom-table">*}

diff --git a/framework/modules/pixidou/views/pixidou/editor.tpl b/framework/modules/pixidou/views/pixidou/editor.tpl
@@ -46,8 +46,10 @@
 <!DOCTYPE HTML>
 <html>
     <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" >
+        {*<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" >*}
+        <meta charset="{$smarty.const.LANG_CHARSET}">
         <title>Pixidou - {'Open Source AJAX Image Editor'|gettext}</title>
+        <meta name="Generator" content="Exponent Content Management System - v{expVersion::getVersion(true)}"/>
 	    <link rel="stylesheet" type="text/css" href="{$smarty.const.YUI2_RELATIVE}yui2-reset-fonts/yui2-reset-fonts.css" >
 	    <link rel="stylesheet" type="text/css" href="{$smarty.const.YUI2_RELATIVE}assets/skins/sam/skin.css" >
         <link rel="stylesheet" type="text/css" href="{$smarty.const.PATH_RELATIVE}framework/modules/pixidou/assets/css/pixidou.css" >

diff --git a/install/index.php b/install/index.php
@@ -227,10 +227,10 @@
     <!DOCTYPE HTML>
     <html>
     <head>
+<!--        <meta http-equiv="Content-Type" content="text/html; charset=--><?php //echo LANG_CHARSET; ?><!--"/>-->
+        <meta charset="<?php echo LANG_CHARSET; ?>">
         <title><?php echo gt('Exponent Install Wizard'); ?></title>
-        <meta http-equiv="Content-Type" content="text/html; charset=<?php echo LANG_CHARSET; ?>"/>
-        <meta name="Generator"
-              content="Exponent Content Management System - <?php echo expVersion::getVersion(true); ?>"/>
+        <meta name="Generator" content="Exponent Content Management System - <?php echo expVersion::getVersion(true); ?>"/>
         <link rel="stylesheet" href="<?php echo PATH_RELATIVE; ?>external/normalize/normalize.css"/>
         <link rel="stylesheet" href="<?php echo PATH_RELATIVE; ?>framework/core/assets/css/forms.css"/>
         <link rel="stylesheet" href="<?php echo PATH_RELATIVE; ?>framework/core/assets/css/button.css"/>

diff --git a/install/popup.php b/install/popup.php
@@ -22,10 +22,11 @@
 <!DOCTYPE HTML>
 <html>
 <head>
+<!--    <meta http-equiv="Content-Type" content="text/html; charset=--><?php //echo LANG_CHARSET; ?><!--"/>-->
+    <meta charset="<?php echo LANG_CHARSET; ?>">
     <title><?php echo gt('Exponent CMS : Install Wizard Help'); ?></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=<?php echo LANG_CHARSET; ?>"/>
     <meta name="Generator" content="Exponent Content Management System - <?php echo expVersion::getVersion(true); ?>"/>
-    <link rel="stylesheet" href="<?php echo PATH_RELATIVE; ?>external/normalize/normalize.css"/>
+     <link rel="stylesheet" href="<?php echo PATH_RELATIVE; ?>external/normalize/normalize.css"/>
     <link rel="stylesheet" href="<?php echo PATH_RELATIVE; ?>framework/core/assets/css/forms.css"/>
     <link rel="stylesheet" href="<?php echo PATH_RELATIVE; ?>framework/core/assets/css/button.css"/>
     <link rel="stylesheet" href="<?php echo PATH_RELATIVE; ?>framework/core/assets/css/tables.css"/>