Skip to content

E
edx-platform
Commit aad7c52f by Brian Talbot
Options

LMS: updating use of IE-conditional comments 

* to reflect support for IE10 and above
* to only flag IE9 (for emergency's sake) with specific html class attrs
* to remove HTML5 shiv that's not needed for IE10 and above
parent 161d89a7
Showing with 6 additions and 24 deletions
cms/templates/base.html
...@@ -7,8 +7,6 @@ import json ...@@ -7,8 +7,6 @@ import json
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='static_content.html'/>
<!doctype html> <!doctype html>
<!--[if IE 7]><html class="ie7 lte9 lte8 lte7" lang="${LANGUAGE_CODE}"><![endif]-->
<!--[if IE 8]><html class="ie8 lte9 lte8" lang="${LANGUAGE_CODE}"><![endif]-->
<!--[if IE 9]><html class="ie9 lte9" lang="${LANGUAGE_CODE}"><![endif]--> <!--[if IE 9]><html class="ie9 lte9" lang="${LANGUAGE_CODE}"><![endif]-->
<!--[if gt IE 9]><!--><html lang="${LANGUAGE_CODE}"><!--<![endif]--> <!--[if gt IE 9]><!--><html lang="${LANGUAGE_CODE}"><!--<![endif]-->
<% <%
......
lms/templates/main.html
<!DOCTYPE html> <!DOCTYPE html>
<!--[if IE 7]><html class="ie ie7 lte9 lte8 lte7" lang="${LANGUAGE_CODE}"><![endif]--> <!--[if lte IE 9]><html class="ie ie9 lte9" lang="${LANGUAGE_CODE}"><![endif]-->
<!--[if IE 8]><html class="ie ie8 lte9 lte8" lang="${LANGUAGE_CODE}"><![endif]--> <!--[if !IE]><!--><html lang="${LANGUAGE_CODE}"><!--<![endif]-->
<!--[if IE 9]><html class="ie ie9 lte9" lang="${LANGUAGE_CODE}"><![endif]-->
<!--[if gt IE 9]><!--><html lang="${LANGUAGE_CODE}"><!--<![endif]-->
<% <%
# set doc language direction # set doc language direction
from django.utils.translation import get_language_bidi from django.utils.translation import get_language_bidi
...@@ -117,10 +115,6 @@ ...@@ -117,10 +115,6 @@
<%include file="${header_extra_file}" /> <%include file="${header_extra_file}" />
% endif % endif
<!--[if lt IE 9]>
<script src="${static.url('js/html5shiv.js')}"></script>
<![endif]-->
<%include file="widgets/optimizely.html" /> <%include file="widgets/optimizely.html" />
<%include file="widgets/segment-io.html" /> <%include file="widgets/segment-io.html" />
......
lms/templates/main_django.html
...@@ -20,10 +20,6 @@ ...@@ -20,10 +20,6 @@
{% microsite_css_overrides_file %} {% microsite_css_overrides_file %}
<!--[if lt IE 9]>
<script src="{% static 'js/html5shiv.js' %}"></script>
<![endif]-->
<meta name="path_prefix" content="{{EDX_ROOT_URL}}"> <meta name="path_prefix" content="{{EDX_ROOT_URL}}">
</head> </head>
......
lms/templates/mktg_iframe.html
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='static_content.html'/>
<!DOCTYPE html> <!DOCTYPE html>
<!--[if IE 7]><html class="ie ie7 lte9 lte8 lte7 view-iframe" lang="${LANGUAGE_CODE}"><![endif]--> <!--[if lte IE 9]><html class="ie ie9 lte9 view-iframe" lang="${LANGUAGE_CODE}"><![endif]-->
<!--[if IE 8]><html class="ie ie8 lte9 lte8 view-iframe" lang="${LANGUAGE_CODE}"><![endif]--> <!--[if !IE]><!--><html class="view-iframe" lang="${LANGUAGE_CODE}"><!--<![endif]-->
<!--[if IE 9]><html class="ie ie9 lte9 view-iframe" lang="${LANGUAGE_CODE}"><![endif]-->
<!--[if gt IE 9]><!--><html class="view-iframe" lang="${LANGUAGE_CODE}"><!--<![endif]-->
<head> <head>
<%block name="title"></%block> <%block name="title"></%block>
...@@ -15,10 +13,6 @@ ...@@ -15,10 +13,6 @@
<%static:css group='style-app'/> <%static:css group='style-app'/>
<%static:js group='base_vendor'/> <%static:js group='base_vendor'/>
<!--[if lt IE 9]>
<script src="${static.url('js/html5shiv.js')}"></script>
<![endif]-->
<%block name="headextra"/> <%block name="headextra"/>
<%include file="widgets/optimizely.html" /> <%include file="widgets/optimizely.html" />
......
lms/templates/navigation-edx.html
...@@ -145,7 +145,7 @@ site_status_msg = get_site_status_msg(course_id) ...@@ -145,7 +145,7 @@ site_status_msg = get_site_status_msg(course_id)
</div> </div>
</header> </header>
% if course: % if course:
<!--[if lte IE 8]> <!--[if lte IE 9]>
<div class="ie-banner" aria-hidden="true">${_('<strong>Warning:</strong> Your browser is not fully supported. We strongly recommend using {chrome_link} or {ff_link}.').format(chrome_link='<a href="https://www.google.com/intl/en/chrome/browser/" target="_blank">Chrome</a>', ff_link='<a href="http://www.mozilla.org/en-US/firefox/new/" target="_blank">Firefox</a>')}</div> <div class="ie-banner" aria-hidden="true">${_('<strong>Warning:</strong> Your browser is not fully supported. We strongly recommend using {chrome_link} or {ff_link}.').format(chrome_link='<a href="https://www.google.com/intl/en/chrome/browser/" target="_blank">Chrome</a>', ff_link='<a href="http://www.mozilla.org/en-US/firefox/new/" target="_blank">Firefox</a>')}</div>
<![endif]--> <![endif]-->
% endif % endif
......
lms/templates/navigation.html
...@@ -151,7 +151,7 @@ site_status_msg = get_site_status_msg(course_id) ...@@ -151,7 +151,7 @@ site_status_msg = get_site_status_msg(course_id)
</nav> </nav>
</header> </header>
% if course: % if course:
<!--[if lte IE 8]> <!--[if lte IE 9]>
<div class="ie-banner" aria-hidden="true">${_('<strong>Warning:</strong> Your browser is not fully supported. We strongly recommend using {chrome_link} or {ff_link}.').format(chrome_link='<a href="https://www.google.com/intl/en/chrome/browser/" target="_blank">Chrome</a>', ff_link='<a href="http://www.mozilla.org/en-US/firefox/new/" target="_blank">Firefox</a>')}</div> <div class="ie-banner" aria-hidden="true">${_('<strong>Warning:</strong> Your browser is not fully supported. We strongly recommend using {chrome_link} or {ff_link}.').format(chrome_link='<a href="https://www.google.com/intl/en/chrome/browser/" target="_blank">Chrome</a>', ff_link='<a href="http://www.mozilla.org/en-US/firefox/new/" target="_blank">Firefox</a>')}</div>
<![endif]--> <![endif]-->
% endif % endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment