Merge pull request #802 from geoadmin/dev_IE_fixes

IE mode troubles
geoadmin · Nov 13, 2013 · 2d9f38a · 2d9f38a
2 parents c4af088 + 01b88c3
commit 2d9f38a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/apache/app.mako-dot-conf b/apache/app.mako-dot-conf
@@ -26,6 +26,10 @@ Alias ${base_url_path}/prod ${base_dir}/prd
 RewriteRule ^/(index.html|mobile.html|info.json|checker)(.*) /var/www/vhosts/mf-geoadmin3/private/geoadmin/prd/$1
 RewriteRule ^/[0-9]+/(img|lib|style|rest|locales)(.*) /var/www/vhosts/mf-geoadmin3/private/geoadmin/prd/$1$2
 
+<IfModule mod_headers.c>
+  Header set X-UA-Compatible "IE=Edge"
+</IfModule>
+
 <LocationMatch /[0-9]+/>
    ExpiresDefault "now plus 1 year"
    Header merge Cache-Control "public"

diff --git a/src/index.mako.html b/src/index.mako.html
@@ -1,15 +1,21 @@
 # -*- coding: utf-8 -*-
+<!--[if HTML5]><![endif]-->
 <!DOCTYPE html>
-<html ng-app="ga" ng-controller="GaMainController">
+<!--[if lt IE 7]>      <html ng-app="ga" ng-controller="GaMainController" class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
+<!--[if IE 7]>         <html ng-app="ga" ng-controller="GaMainController" class="no-js lt-ie9 lt-ie8"> <![endif]-->
+<!--[if IE 8]>         <html ng-app="ga" ng-controller="GaMainController" class="no-js lt-ie9"> <![endif]-->
+<!--[if gt IE 8]><!--> <html ng-app="ga" ng-controller="GaMainController" class="no-js"> <!--<![endif]-->
   <head>
+    <!--[if !HTML5]>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+    <![endif]-->
 % if device == 'desktop':
     <title translate="{{topicId + '_page_title'}}">map.geo.admin.ch</title>
 % else:
     <title>geo.admin.ch</title>
 % endif
     <meta charset="utf-8">
     <meta name="viewport" content="initial-scale=1.0, user-scalable=no">
-    <meta http-equiv="X-UA-Compatible" content="IE=9;IE=10; IE=EDGE" />
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <meta name="msapplication-TileImage" content="${version}img/touch-icon-bund-144x144.png">