From aad7c52f412ec4b316c75039245b41dfa5c19333 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Thu, 14 May 2015 14:15:04 -0400 Subject: [PATCH] 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 --- cms/templates/base.html | 2 -- lms/templates/main.html | 10 ++-------- lms/templates/main_django.html | 4 ---- lms/templates/mktg_iframe.html | 10 ++-------- lms/templates/navigation-edx.html | 2 +- lms/templates/navigation.html | 2 +- 6 files changed, 6 insertions(+), 24 deletions(-) diff --git a/cms/templates/base.html b/cms/templates/base.html index 049450ca09..0a24b03bbd 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -7,8 +7,6 @@ import json <%namespace name='static' file='static_content.html'/> - - <% diff --git a/lms/templates/main.html b/lms/templates/main.html index 9dd5b4e310..b7608732e5 100644 --- a/lms/templates/main.html +++ b/lms/templates/main.html @@ -1,8 +1,6 @@ - - - - + + <% # set doc language direction from django.utils.translation import get_language_bidi @@ -117,10 +115,6 @@ <%include file="${header_extra_file}" /> % endif - - <%include file="widgets/optimizely.html" /> <%include file="widgets/segment-io.html" /> diff --git a/lms/templates/main_django.html b/lms/templates/main_django.html index ae85eb2226..4ad111f7ec 100644 --- a/lms/templates/main_django.html +++ b/lms/templates/main_django.html @@ -20,10 +20,6 @@ {% microsite_css_overrides_file %} - - diff --git a/lms/templates/mktg_iframe.html b/lms/templates/mktg_iframe.html index b6359f89dc..ec80e67204 100644 --- a/lms/templates/mktg_iframe.html +++ b/lms/templates/mktg_iframe.html @@ -1,9 +1,7 @@ <%namespace name='static' file='static_content.html'/> - - - - + + <%block name="title"> @@ -15,10 +13,6 @@ <%static:css group='style-app'/> <%static:js group='base_vendor'/> - - <%block name="headextra"/> <%include file="widgets/optimizely.html" /> diff --git a/lms/templates/navigation-edx.html b/lms/templates/navigation-edx.html index bc3f8e525c..ab5b2822b5 100644 --- a/lms/templates/navigation-edx.html +++ b/lms/templates/navigation-edx.html @@ -145,7 +145,7 @@ site_status_msg = get_site_status_msg(course_id) % if course: - % endif diff --git a/lms/templates/navigation.html b/lms/templates/navigation.html index b0c1dd5fa3..3ace11d370 100644 --- a/lms/templates/navigation.html +++ b/lms/templates/navigation.html @@ -151,7 +151,7 @@ site_status_msg = get_site_status_msg(course_id) % if course: - % endif