Merge pull request #11067 from edx/cdodge/allow-nested-templates

Replace https://github.com/edx/edx-platform/pull/10780 with this PR

lms/templates/main.html

@@ -135,7 +135,7 @@ from branding import api as branding_api
     % endif
 
     <div class="content-wrapper" id="content">
-      ${self.body()}
+      ${next.body()}
       <%block name="bodyextra"/>
     </div>
 

lms/templates/navigation.html

@@ -123,6 +123,8 @@ site_status_msg = get_site_status_msg(course_id)
           </li>
         % endif
       </%block>
+
+      <%block name="navigation_other_global_links">
         % if not settings.FEATURES['DISABLE_LOGIN_BUTTON']:
             % if settings.FEATURES.get('ENABLE_COURSE_DISCOVERY'):
             <li class="nav-global-05">
@@ -140,9 +142,11 @@ site_status_msg = get_site_status_msg(course_id)
             % endif
 
         % endif
+      </%block>
     </ol>
 
     <ol class="right nav-courseware">
+      <%block name="navigation_sign_in">
         <li class="nav-courseware-01">
           % if not settings.FEATURES['DISABLE_LOGIN_BUTTON']:
               % if course and settings.FEATURES.get('RESTRICT_ENROLL_BY_REG_METHOD') and course.enrollment_domain:
@@ -152,6 +156,7 @@ site_status_msg = get_site_status_msg(course_id)
               % endif
           % endif
         </li>
+      </%block>
     </ol>
     % endif
   </nav>

lms/templates/register.html

@@ -112,6 +112,7 @@ import calendar
 <section class="register container">
   <section role="main" class="content">
     <form role="form" id="register-form" method="post" data-remote="true" action="/create_account" novalidate>
+      <%block name="register_form">
       <input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }">
 
       <!-- status messages -->
@@ -369,6 +370,7 @@ import calendar
       <div class="form-actions">
         <button name="submit" type="submit" id="submit" class="action action-primary action-update register-button">${_('Register')} <span class="orn-plus">+</span> ${_('Create My Account')}</button>
       </div>
+      </%block>
     </form>
   </section>