From a336ae7df6781dc9466e88d6df91b33d89712e62 Mon Sep 17 00:00:00 2001
From: Usman Khalid <2200617@gmail.com>
Date: Thu, 2 Jan 2014 16:03:43 +0500
Subject: [PATCH 1/2] edge.html inherits from main.html LMS-1584
---
lms/djangoapps/branding/views.py | 5 ++++-
lms/static/sass/multicourse/_edge.scss | 11 +++++++++++
lms/templates/university_profile/edge.html | 5 ++++-
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/lms/djangoapps/branding/views.py b/lms/djangoapps/branding/views.py
index b725f7e199..0adf733818 100644
--- a/lms/djangoapps/branding/views.py
+++ b/lms/djangoapps/branding/views.py
@@ -30,7 +30,10 @@ def index(request):
university = branding.get_university(request.META.get('HTTP_HOST'))
if university == 'edge':
- return render_to_response('university_profile/edge.html', {})
+ context = {
+ 'suppress_toplevel_navigation': True
+ }
+ return render_to_response('university_profile/edge.html', context)
# we do not expect this case to be reached in cases where
# marketing and edge are enabled
diff --git a/lms/static/sass/multicourse/_edge.scss b/lms/static/sass/multicourse/_edge.scss
index d38f648d04..e7c9a67624 100644
--- a/lms/static/sass/multicourse/_edge.scss
+++ b/lms/static/sass/multicourse/_edge.scss
@@ -76,6 +76,10 @@ $paleYellow: #fffcf1;
text-decoration: none;
}
+ .content-wrapper {
+ background: $body-bg;
+ }
+
.main-wrapper {
width: 942px;
margin: auto;
@@ -186,6 +190,13 @@ $paleYellow: #fffcf1;
}
}
+ #password-reset {
+ header {
+ background: none;
+ border-bottom: none;
+ }
+ }
+
#register {
font-family: $sans-serif;
diff --git a/lms/templates/university_profile/edge.html b/lms/templates/university_profile/edge.html
index 166a95a106..3b5dfda650 100644
--- a/lms/templates/university_profile/edge.html
+++ b/lms/templates/university_profile/edge.html
@@ -1,6 +1,9 @@
<%! from django.utils.translation import ugettext as _ %>
-<%inherit file="../stripped-main.html" />
+
+<%inherit file="../main.html" />
+
<%! from django.core.urlresolvers import reverse %>
+
<%block name="title">${_("edX edge")}
<%block name="bodyclass">no-header edge-landing
From 864267a286904977b9f4b86dda8db958be53d562 Mon Sep 17 00:00:00 2001
From: Usman Khalid <2200617@gmail.com>
Date: Thu, 2 Jan 2014 17:54:57 +0500
Subject: [PATCH 2/2] Removed stripped-main.html since it is not being used
anymore. LMS-1584
---
lms/templates/stripped-main.html | 39 --------------------------------
1 file changed, 39 deletions(-)
delete mode 100644 lms/templates/stripped-main.html
diff --git a/lms/templates/stripped-main.html b/lms/templates/stripped-main.html
deleted file mode 100644
index f2e8545e96..0000000000
--- a/lms/templates/stripped-main.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<%! from django.utils.translation import ugettext as _ %>
-
-<%namespace name='static' file='static_content.html'/>
-
-
-
-
-
-
- ## "edX" should not be translated
- <%block name="title">edX
-
-
-
- <%static:css group='style-vendor'/>
- <%static:css group='style-app'/>
- <%static:css group='style-app-extend1'/>
- <%static:css group='style-app-extend2'/>
-
- <%static:js group='main_vendor'/>
- <%block name="headextra"/>
-
-
-
-
-
-
-
- ${self.body()}
- <%block name="bodyextra"/>
-
- <%static:js group='application'/>
- <%static:js group='module-js'/>
-
- <%block name="js_extra"/>
-
-