Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LMS: updating use of IE-conditional comments

Browse Source 
* 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
This commit is contained in:
Brian Talbot
2015-05-14 14:15:04 -04:00
parent 161d89a723
commit aad7c52f41
6 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/templates/base.html
View File

@@ -7,8 +7,6 @@ import json
<%namespace name='static' file='static_content.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 gt IE 9]><!--><html lang="${LANGUAGE_CODE}"><!--<![endif]-->
<%

10
lms/templates/main.html
View File

@@ -1,8 +1,6 @@
<!DOCTYPE html>
<!--[if IE 7]><html class="ie ie7 lte9 lte8 lte7" lang="${LANGUAGE_CODE}"><![endif]-->
<!--[if IE 8]><html class="ie ie8 lte9 lte8" 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]-->
<!--[if lte IE 9]><html class="ie ie9 lte9" lang="${LANGUAGE_CODE}"><![endif]-->
<!--[if !IE]><!--><html lang="${LANGUAGE_CODE}"><!--<![endif]-->
<%
# set doc language direction
from django.utils.translation import get_language_bidi
@@ -117,10 +115,6 @@
<%include file="${header_extra_file}" />
% endif
<!--[if lt IE 9]>
<script src="${static.url('js/html5shiv.js')}"></script>
<![endif]-->
<%include file="widgets/optimizely.html" />
<%include file="widgets/segment-io.html" />

4
lms/templates/main_django.html
View File

@@ -20,10 +20,6 @@
{% microsite_css_overrides_file %}
<!--[if lt IE 9]>
<script src="{% static 'js/html5shiv.js' %}"></script>
<![endif]-->
<meta name="path_prefix" content="{{EDX_ROOT_URL}}">
</head>

10
lms/templates/mktg_iframe.html
View File

@@ -1,9 +1,7 @@
<%namespace name='static' file='static_content.html'/>
<!DOCTYPE html>
<!--[if IE 7]><html class="ie ie7 lte9 lte8 lte7 view-iframe" lang="${LANGUAGE_CODE}"><![endif]-->
<!--[if IE 8]><html class="ie ie8 lte9 lte8 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]-->
<!--[if lte IE 9]><html class="ie ie9 lte9 view-iframe" lang="${LANGUAGE_CODE}"><![endif]-->
<!--[if !IE]><!--><html class="view-iframe" lang="${LANGUAGE_CODE}"><!--<![endif]-->
<head>
<%block name="title"></%block>
@@ -15,10 +13,6 @@
<%static:css group='style-app'/>
<%static:js group='base_vendor'/>
<!--[if lt IE 9]>
<script src="${static.url('js/html5shiv.js')}"></script>
<![endif]-->
<%block name="headextra"/>
<%include file="widgets/optimizely.html" />

2
lms/templates/navigation-edx.html
View File

@@ -145,7 +145,7 @@ site_status_msg = get_site_status_msg(course_id)
</div>
</header>
% 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>
<![endif]-->
% endif

2
lms/templates/navigation.html
View File

@@ -151,7 +151,7 @@ site_status_msg = get_site_status_msg(course_id)
</nav>
</header>
% 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>
<![endif]-->
% endif