Fixed issue #08636 : Deactivate IE compatibility view on Admin and pu…

…blic template Dev: X-UA-Compatible edge to be sure to use last for all IE Dev: To be confirmed : fix #08325: Part of long text is hidden in Ranking form (MS Internet Explorer) Dev: to be confirmed : fix #08635: Adding answer options impossible in IE9
LimeSurvey · Feb 1, 2014 · bb0a1b2 · bb0a1b2
1 parent 6018bde
commit bb0a1b2
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 5 deletions.
diff --git a/application/views/admin/super/header.php b/application/views/admin/super/header.php
@@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html lang="<?php echo $adminlang; ?>"<?php echo $languageRTL;?>>
 <head>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+    <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge" /><![endif]-->
     <?php 
         App()->getClientScript()->registerPackage('jqueryui');
         App()->getClientScript()->registerPackage('jquery-cookie');
@@ -15,8 +17,6 @@
         App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "adminstyle.css" );
         App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "printablestyle.css", 'print');
     ?>
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-
     <?php echo $datepickerlang;?>
     <title><?php echo $sitename;?></title>
     <link rel="shortcut icon" href="<?php echo $baseurl;?>styles/favicon.ico" type="image/x-icon" />

diff --git a/application/views/layouts/main.php b/application/views/layouts/main.php
@@ -2,6 +2,7 @@
 <html>
     <head>
         <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+        <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge" /><![endif]-->
         <?php 
             App()->getClientScript()->registerPackage('jqueryui');
             App()->getClientScript()->registerPackage('qTip2');

diff --git a/templates/basic/startpage.pstpl b/templates/basic/startpage.pstpl
@@ -1,5 +1,6 @@
 
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		<!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge" /><![endif]-->
 		<title>{SURVEYNAME} :: {GROUPNAME}</title>
 		<meta name="generator" content="LimeSurvey http://www.limesurvey.org" />
 

diff --git a/templates/bluengrey/startpage.pstpl b/templates/bluengrey/startpage.pstpl
@@ -1,4 +1,5 @@
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		<!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge" /><![endif]-->
 		<title>
 			{SURVEYNAME}
 		</title>

diff --git a/templates/citronade/startpage.pstpl b/templates/citronade/startpage.pstpl
@@ -1,4 +1,6 @@
-<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+    <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge" /><![endif]-->
     <title>{SURVEYNAME} {GROUPNAME} {SITENAME}</title>
     <meta name="generator" content="LimeSurvey http://www.limesurvey.org" />
     <meta name="viewport" content="width=device-width" />

diff --git a/templates/clear_logo/startpage.pstpl b/templates/clear_logo/startpage.pstpl
@@ -1,5 +1,6 @@
 
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+	<!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge" /><![endif]-->
 
 	<title>{SURVEYNAME} :: {GROUPNAME}</title>
 

diff --git a/templates/default/startpage.pstpl b/templates/default/startpage.pstpl
@@ -1,4 +1,5 @@
 <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge" /><![endif]-->
 <title>{SURVEYNAME}</title>
 <meta name="generator" content="LimeSurvey http://www.limesurvey.org" />
 

diff --git a/templates/eirenicon/startpage.pstpl b/templates/eirenicon/startpage.pstpl
@@ -1,4 +1,5 @@
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />	
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+	<!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge" /><![endif]-->
 	<title> {SURVEYNAME} </title>
 	<meta name="generator" content="LimeSurvey http://www.limesurvey.org" />
 

diff --git a/templates/limespired/startpage.pstpl b/templates/limespired/startpage.pstpl
@@ -1,5 +1,6 @@
 
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		<!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge" /><![endif]-->
 		<title>{SURVEYNAME} &ndash; {GROUPNAME}</title>
 		<meta name="generator" content="LimeSurvey http://www.limesurvey.org" />
 

diff --git a/templates/mint_idea/startpage.pstpl b/templates/mint_idea/startpage.pstpl
@@ -1,4 +1,5 @@
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		<!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge" /><![endif]-->
 		<title>SURVEY: {SURVEYNAME}</title>
 		<meta name="generator" content="LimeSurvey http://www.limesurvey.org" />
 

diff --git a/templates/sherpa/startpage.pstpl b/templates/sherpa/startpage.pstpl
@@ -1,4 +1,5 @@
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		<!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge" /><![endif]-->
 		<title>
 			SURVEY: {SURVEYNAME}
 		</title>

diff --git a/templates/vallendar/startpage.pstpl b/templates/vallendar/startpage.pstpl
@@ -1,5 +1,6 @@
 
-		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />	
+		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+		<!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge" /><![endif]-->
 		<title>{SURVEYNAME}</title>
 		<meta name="generator" content="LimeSurvey http://www.limesurvey.org" />