Skip to content

E
edx-platform
Commit 239fe55b by Jason Bau
Options

Merge pull request #1007 from edx/giulio/carnegie-theme 

Conditional Carnegie theme changes
parents fab6e278 d13dbbf9
Showing with 19 additions and 1 deletions
lms/templates/courseware/course_about.html
......@@ -84,6 +84,9 @@
<a href="#">${get_course_about_section(course, "university")}</a>
% endif
</h1>
% if self.carnegie_theme_enabled():
<br /><h2>learn to use this user-friendly technology from experts</h2>
% endif
</hgroup>
<div class="main-cta">
......@@ -124,7 +127,11 @@
</header>
<section class="container">
% if self.carnegie_theme_enabled():
<section class="details" style="float: none; width: 100%; margin: 0 auto;">
% else:
<section class="details">
% endif
<nav>
<a href="#" class="active">${_("Overview")}</a>
## <a href="#">${_("FAQ")}</a>
......@@ -139,6 +146,7 @@
</div>
</section>
% if not self.carnegie_theme_enabled():
<section class="course-sidebar">
<section class="course-summary">
<header>
......@@ -214,6 +222,7 @@
</section>
%endif
</section>
% endif
</section>
</section>
......
lms/templates/index.html
......@@ -15,6 +15,7 @@
% else:
<h1>${_("The Future of Online Education")}</h1>
% endif
<h2>${_("For anyone, anywhere, anytime")}</h2>
</hgroup>
......
lms/templates/main.html
......@@ -15,6 +15,10 @@
<% return theme_enabled() and getattr(settings, "THEME_NAME") == "stanford" %>
</%def>
<%def name="carnegie_theme_enabled()">
<% return theme_enabled() and getattr(settings, "THEME_NAME") == "carnegie" %>
</%def>
<!DOCTYPE html>
<!--[if lt IE 8]><html class="ie"><![endif]-->
<!--[if IE 8]><html class="ie8"><![endif]-->
......@@ -23,6 +27,8 @@
<%block name="title">
% if stanford_theme_enabled():
<title>${_("Home")} | class.stanford.edu</title>
% elif carnegie_theme_enabled():
<title>${_("Home")} | CLASlite</title>
% else:
## "edX" should not be translated
<title>edX</title>
......
lms/templates/navigation.html
......@@ -42,7 +42,7 @@ site_status_msg = get_site_status_msg(course_id)
<nav>
<h1 class="logo">
<a href="${marketing_link('ROOT')}">
<a href="<%block name='navigation_link'>${marketing_link('ROOT')}</%block>">
<%block name="navigation_logo">
<img src="${static.url(branding.get_logo_url(request.META.get('HTTP_HOST')))}" alt="${settings.PLATFORM_NAME} ${_('Home')}" />
</%block>
......@@ -95,6 +95,7 @@ site_status_msg = get_site_status_msg(course_id)
</li>
% endif
</%block>
<%block name="register_link">
% if not settings.MITX_FEATURES['DISABLE_LOGIN_BUTTON']:
% if course and settings.MITX_FEATURES.get('RESTRICT_ENROLL_BY_REG_METHOD') and course.enrollment_domain:
<li class="nav-global-04">
......@@ -106,6 +107,7 @@ site_status_msg = get_site_status_msg(course_id)
</li>
% endif
% endif
</%block>
</ol>
<ol class="right nav-courseware">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment