MDL-59612 core: edit 'frametop' layout so links display for LTI

Part of MDL-59313.
moodle · Jul 31, 2017 · 585146f · 585146f
1 parent d8cb461
commit 585146f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
@@ -821,7 +821,8 @@ public function main_content() {
     public function activity_navigation() {
         // First we should check if we want to add navigation.
         $context = $this->page->context;
-        if ($this->page->pagelayout !== 'incourse' || $context->contextlevel != CONTEXT_MODULE) {
+        if (($this->page->pagelayout !== 'incourse' && $this->page->pagelayout !== 'frametop')
+            || $context->contextlevel != CONTEXT_MODULE) {
             return '';
         }
 

diff --git a/theme/boost/templates/columns1.mustache b/theme/boost/templates/columns1.mustache
@@ -58,6 +58,7 @@
                     <div class="card card-block">
                     {{{ output.course_content_header }}}
                     {{{ output.main_content }}}
+                    {{{ output.activity_navigation }}}
                     {{{ output.course_content_footer }}}
                     </div>
                 </section>

diff --git a/theme/bootstrapbase/layout/columns1.php b/theme/bootstrapbase/layout/columns1.php
@@ -63,6 +63,7 @@
             <?php
             echo $OUTPUT->course_content_header();
             echo $OUTPUT->main_content();
+            echo $OUTPUT->activity_navigation();
             echo $OUTPUT->course_content_footer();
             ?>
         </section>

diff --git a/theme/clean/layout/columns1.php b/theme/clean/layout/columns1.php
@@ -65,6 +65,7 @@
             <?php
             echo $OUTPUT->course_content_header();
             echo $OUTPUT->main_content();
+            echo $OUTPUT->activity_navigation();
             echo $OUTPUT->course_content_footer();
             ?>
         </section>