Browse Source

Merge pull request #1361 from aragonc/1.11.x

fix show navigation menu - refs CT#8389
Alex Aragon Calixto 8 years ago
parent
commit
d0ae8c5e53

+ 2 - 2
main/inc/lib/template.lib.php

@@ -406,13 +406,13 @@ class Template
             if (api_get_setting('show_toolshortcuts') != 'false') {
                 //Course toolbar
                 $show_course_shortcut = CourseHome::show_navigation_tool_shortcuts();
-            }
+            } 
             if (api_get_setting('show_navigation_menu') != 'false') {
                 //Course toolbar
                 $show_course_navigation_menu = CourseHome::show_navigation_menu();
             }
         }
-        $this->assign('show_course_shortcut', $show_course_shortcut);
+        //$this->assign('show_course_shortcut', $show_course_shortcut);
         $this->assign('show_course_navigation_menu', $show_course_navigation_menu);
     }
 

+ 1 - 1
main/template/default/layout/page.tpl

@@ -42,7 +42,7 @@
             {% block breadcrumb %}
                 {{ breadcrumb }}
             {% endblock %}
-            {% include template ~ "/layout/course_navigation.tpl" %}
+            
             {% block body %}
                 {{ content }}
             {% endblock %}

+ 1 - 0
main/template/default/layout/page_header.tpl

@@ -51,3 +51,4 @@
     {% include template ~ "/layout/menu.tpl" %}
 {% endblock %}
 </header>
+{% include template ~ "/layout/course_navigation.tpl" %}