Commit d13dbbf9 by Giulio Gratta

conditional changes for carnegie theme

parent 537d128c
...@@ -79,6 +79,9 @@ ...@@ -79,6 +79,9 @@
<a href="#">${get_course_about_section(course, "university")}</a> <a href="#">${get_course_about_section(course, "university")}</a>
% endif % endif
</h1> </h1>
% if self.carnegie_theme_enabled():
<br /><h2>learn to use this user-friendly technology from experts</h2>
% endif
</hgroup> </hgroup>
<div class="main-cta"> <div class="main-cta">
...@@ -120,7 +123,11 @@ ...@@ -120,7 +123,11 @@
</header> </header>
<section class="container"> <section class="container">
% if self.carnegie_theme_enabled():
<section class="details" style="float: none; width: 100%; margin: 0 auto;">
% else:
<section class="details"> <section class="details">
% endif
<nav> <nav>
<a href="#" class="active">${_("Overview")}</a> <a href="#" class="active">${_("Overview")}</a>
## <a href="#">${_("FAQ")}</a> ## <a href="#">${_("FAQ")}</a>
...@@ -135,6 +142,7 @@ ...@@ -135,6 +142,7 @@
</div> </div>
</section> </section>
% if not self.carnegie_theme_enabled():
<section class="course-sidebar"> <section class="course-sidebar">
<section class="course-summary"> <section class="course-summary">
<header> <header>
...@@ -210,6 +218,7 @@ ...@@ -210,6 +218,7 @@
</section> </section>
%endif %endif
</section> </section>
% endif
</section> </section>
</section> </section>
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
% else: % else:
<h1>${_("The Future of Online Education")}</h1> <h1>${_("The Future of Online Education")}</h1>
% endif % endif
<h2>${_("For anyone, anywhere, anytime")}</h2> <h2>${_("For anyone, anywhere, anytime")}</h2>
</hgroup> </hgroup>
......
...@@ -15,12 +15,18 @@ ...@@ -15,12 +15,18 @@
<% return theme_enabled() and getattr(settings, "THEME_NAME") == "stanford" %> <% return theme_enabled() and getattr(settings, "THEME_NAME") == "stanford" %>
</%def> </%def>
<%def name="carnegie_theme_enabled()">
<% return theme_enabled() and getattr(settings, "THEME_NAME") == "carnegie" %>
</%def>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en-us"> <html lang="en-us">
<head> <head>
<%block name="title"> <%block name="title">
% if stanford_theme_enabled(): % if stanford_theme_enabled():
<title>${_("Home")} | class.stanford.edu</title> <title>${_("Home")} | class.stanford.edu</title>
% elif carnegie_theme_enabled():
<title>${_("Home")} | CLASlite</title>
% else: % else:
## "edX" should not be translated ## "edX" should not be translated
<title>edX</title> <title>edX</title>
......
...@@ -42,7 +42,7 @@ site_status_msg = get_site_status_msg(course_id) ...@@ -42,7 +42,7 @@ site_status_msg = get_site_status_msg(course_id)
<nav> <nav>
<h1 class="logo"> <h1 class="logo">
<a href="${marketing_link('ROOT')}"> <a href="<%block name='navigation_link'>${marketing_link('ROOT')}</%block>">
<%block name="navigation_logo"> <%block name="navigation_logo">
<img src="${static.url(branding.get_logo_url(request.META.get('HTTP_HOST')))}" alt="${_('{settings.PLATFORM_NAME} home')}" /> <img src="${static.url(branding.get_logo_url(request.META.get('HTTP_HOST')))}" alt="${_('{settings.PLATFORM_NAME} home')}" />
</%block> </%block>
...@@ -95,6 +95,7 @@ site_status_msg = get_site_status_msg(course_id) ...@@ -95,6 +95,7 @@ site_status_msg = get_site_status_msg(course_id)
</li> </li>
% endif % endif
</%block> </%block>
<%block name="register_link">
% if not settings.MITX_FEATURES['DISABLE_LOGIN_BUTTON']: % if not settings.MITX_FEATURES['DISABLE_LOGIN_BUTTON']:
% if course and settings.MITX_FEATURES.get('RESTRICT_ENROLL_BY_REG_METHOD') and course.enrollment_domain: % if course and settings.MITX_FEATURES.get('RESTRICT_ENROLL_BY_REG_METHOD') and course.enrollment_domain:
<li class="nav-global-04"> <li class="nav-global-04">
...@@ -106,6 +107,7 @@ site_status_msg = get_site_status_msg(course_id) ...@@ -106,6 +107,7 @@ site_status_msg = get_site_status_msg(course_id)
</li> </li>
% endif % endif
% endif % endif
</%block>
</ol> </ol>
<ol class="right nav-courseware"> <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