From d06fbae8e08b98e77035d13e04d355943c1f54dc Mon Sep 17 00:00:00 2001 From: Jason Bau Date: Thu, 30 Jan 2014 15:20:06 -0800 Subject: [PATCH 1/3] fix main.html template -- was eating everything --- lms/templates/main.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lms/templates/main.html b/lms/templates/main.html index eb3d37623a..e909334c43 100644 --- a/lms/templates/main.html +++ b/lms/templates/main.html @@ -34,7 +34,6 @@ ${_("Home")} | class.stanford.edu % else: ${page_title_breadcrumbs(self.pagetitle())} - ## this needs to be here to prevent the title from mysteriously appearing in the body, in one case @@ -49,6 +48,8 @@ })(this); % endif + + From b78e33dbc5bce9612f9d4f99a9d63b544b9af401 Mon Sep 17 00:00:00 2001 From: "Dave St.Germain" Date: Thu, 30 Jan 2014 20:12:05 -0500 Subject: [PATCH 2/3] This script and meta tag shouldn't be inside the title. --- lms/templates/main.html | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/lms/templates/main.html b/lms/templates/main.html index e909334c43..4bec5e4e4f 100644 --- a/lms/templates/main.html +++ b/lms/templates/main.html @@ -21,37 +21,35 @@ return getattr(settings, "THEME_NAME", None) == "stanford" %> - +## this needs to be here to prevent the title from mysteriously appearing in the body, in one case +<%def name="pagetitle()" /> + + <%block name="title"> % if stanford_theme_enabled(): ${_("Home")} | class.stanford.edu % else: ${page_title_breadcrumbs(self.pagetitle())} - ## this needs to be here to prevent the title from mysteriously appearing in the body, in one case - <!--<%block name="pagetitle" />--> - - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - - <script type="text/javascript"> - /* immediately break out of an iframe if coming from the marketing website */ - (function(window) { - if (window.location !== window.top.location) { - window.top.location = window.location; - } - })(this); - </script> % endif - + + From 7399d5171fd9b940703e51e55de5ec98a2702a95 Mon Sep 17 00:00:00 2001 From: Jason Bau Date: Thu, 30 Jan 2014 17:33:42 -0800 Subject: [PATCH 3/3] get rid of the conditional altogether --- lms/templates/main.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lms/templates/main.html b/lms/templates/main.html index 4bec5e4e4f..1a5123fd44 100644 --- a/lms/templates/main.html +++ b/lms/templates/main.html @@ -33,11 +33,7 @@ <%block name="title"> <title> - % if stanford_theme_enabled(): - ${_("Home")} | class.stanford.edu - % else: ${page_title_breadcrumbs(self.pagetitle())} - % endif