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

Merge pull request #2068 from edx/usman/lms1584-edge-home-page

Browse Source 
Fix register button on edge
This commit is contained in:
Usman Khalid
2014-01-10 11:01:44 -08:00
parent 2ad4749a5d 864267a286
commit 76f4eaf947
4 changed files with 19 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lms/djangoapps/branding/views.py
View File

@@ -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

11
lms/static/sass/multicourse/_edge.scss
View File

@@ -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;

39
lms/templates/stripped-main.html
View File

@@ -1,39 +0,0 @@
<%! from django.utils.translation import ugettext as _ %>
<%namespace name='static' file='static_content.html'/>
<!DOCTYPE html>
<!--[if IE 7]><html class="ie ie7 lte9 lte8 lte7"><![endif]-->
<!--[if IE 8]><html class="ie ie8 lte9 lte8"><![endif]-->
<!--[if IE 9]><html class="ie ie9 lte9"><![endif]-->
<!--[if gt IE 9]><!--><html><!--<![endif]-->
<head>
## "edX" should not be translated
<%block name="title"><title>edX</title></%block>
<link rel="icon" type="image/x-icon" href="${static.url('images/favicon.ico')}" />
<%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"/>
<!--[if lt IE 9]>
<script src="${static.url('js/html5shiv.js')}"></script>
<![endif]-->
<meta name="path_prefix" content="${EDX_ROOT_URL}">
</head>
<body class="<%block name='bodyclass'/>">
${self.body()}
<%block name="bodyextra"/>
<%static:js group='application'/>
<%static:js group='module-js'/>
<%block name="js_extra"/>
</body>
</html>

5
lms/templates/university_profile/edge.html
View File

@@ -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"><title>${_("edX edge")}</title></%block>
<%block name="bodyclass">no-header edge-landing</%block>