diff --git a/main/inc/lib/page.lib.php b/main/inc/lib/page.lib.php index c3ea3c7424..9c9f5bd5a3 100644 --- a/main/inc/lib/page.lib.php +++ b/main/inc/lib/page.lib.php @@ -293,6 +293,7 @@ class PageController 'elements' => $content, 'content' => isset($params['content']) ? $params['content'] : null ); + $app['template']->assign($id, $block_menu); } @@ -1428,4 +1429,25 @@ class PageController $tpl->assign('count_courses', $count_courses); $tpl->assign('welcome_to_course_block', 1); } + + /** + * @param array + */ + public function returnNavigationLinks($items) + { + // Main navigation section. + // Tabs that are deactivated are added here. + if (!empty($items)) { + $content = ''; + $this->show_right_block(get_lang('MainNavigation'), null, 'navigation_block', array('content' => $content)); + } + } + } diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php index 3ebdbf444a..484137f68b 100644 --- a/main/inc/lib/template.lib.php +++ b/main/inc/lib/template.lib.php @@ -18,7 +18,7 @@ class Template public $show_header; public $show_footer; public $help; - public $menu_navigation = array(); //Used in the userportal.lib.php function: return_navigation_course_links() + public $menu_navigation = array(); public $show_learnpath = false; // This is a learnpath section or not? public $plugin = null; public $course_id = null; @@ -843,29 +843,17 @@ class Template return $menu; } - public function returnNavigationLinks() + /** + * + * @return string + */ + public function getNavigationLinks() { - $html = ''; - // Deleting the myprofile link. if (api_get_setting('allow_social_tool') == 'true') { unset($this->menu_navigation['myprofile']); } - - // Main navigation section. - // Tabs that are deactivated are added here. - if (!empty($this->menu_navigation)) { - $content = ''; - $html = $this->app['page_controller']->show_right_block(get_lang('MainNavigation'), $content, 'navigation_link_block'); - } - return $html; + return $this->menu_navigation; } public function render_layout($layout = null) diff --git a/main/template/default/index/navigation_block.tpl b/main/template/default/index/navigation_block.tpl new file mode 100644 index 0000000000..87dd3aad2f --- /dev/null +++ b/main/template/default/index/navigation_block.tpl @@ -0,0 +1 @@ +{% include app.template_style ~ '/layout/block_menu.tpl' with {'block_menu': navigation_block} %} diff --git a/main/template/default/layout/layout_2_col.tpl b/main/template/default/layout/layout_2_col.tpl index e5432eb444..b9faa83953 100644 --- a/main/template/default/layout/layout_2_col.tpl +++ b/main/template/default/layout/layout_2_col.tpl @@ -42,7 +42,7 @@ {% include app.template_style ~ "/index/help_block.tpl" %} {# Links that are not added in the tabs #} - {{ navigation_course_links }} + {% include app.template_style ~ "/index/navigation_block.tpl" %} {# Reservation block #} {{ reservation_block }} diff --git a/src/ChamiloLMS/Controller/IndexController.php b/src/ChamiloLMS/Controller/IndexController.php index 507fa66978..1d999271ea 100644 --- a/src/ChamiloLMS/Controller/IndexController.php +++ b/src/ChamiloLMS/Controller/IndexController.php @@ -38,6 +38,8 @@ class IndexController extends CommonController public function indexAction(Application $app) { $this->cidReset(); + /** @var \Template $template */ + $template = $app['template']; /* var_dump($app['request']->getBaseUrl()); @@ -110,7 +112,7 @@ class IndexController extends CommonController } if (api_get_setting('display_categories_on_homepage') == 'true') { - $app['template']->assign('course_category_block', $app['page_controller']->return_courses_in_categories()); + $template->assign('course_category_block', $app['page_controller']->return_courses_in_categories()); } // @todo Custom Facebook connection lib could be replaced with opauth @@ -144,18 +146,14 @@ class IndexController extends CommonController $announcementsBlock = $app['page_controller']->return_announcements(); } - $app['template']->assign('hot_courses', $hotCourses); - $app['template']->assign('announcements_block', $announcementsBlock); + $template->assign('hot_courses', $hotCourses); + $template->assign('announcements_block', $announcementsBlock); // Homepage - $app['template']->assign('home_page_block', $app['page_controller']->returnHomePage()); + $template->assign('home_page_block', $app['page_controller']->returnHomePage()); // Navigation links - $navLinks = $app['template']->returnNavigationLinks(); - - $app['template']->assign('navigation_course_links', $navLinks); - $app['template']->assign('main_navigation_block', $navLinks); - + $app['page_controller']->returnNavigationLinks($template->getNavigationLinks()); $app['page_controller']->return_notice(); $app['page_controller']->return_help(); @@ -164,10 +162,10 @@ class IndexController extends CommonController } if (!empty($loginError)) { - $app['template']->assign('login_failed', $this->handleLoginFailed($loginError)); + $template->assign('login_failed', $this->handleLoginFailed($loginError)); } - $response = $app['template']->render_layout('layout_2_col.tpl'); + $response = $template->render_layout('layout_2_col.tpl'); //return new Response($response, 200, array('Cache-Control' => 's-maxage=3600, public')); return new Response($response, 200, array()); diff --git a/src/ChamiloLMS/Controller/UserPortalController.php b/src/ChamiloLMS/Controller/UserPortalController.php index 2c7649c90e..95b41064f1 100644 --- a/src/ChamiloLMS/Controller/UserPortalController.php +++ b/src/ChamiloLMS/Controller/UserPortalController.php @@ -76,17 +76,14 @@ class UserPortalController extends CommonController return $menu; }; $app['knp_menu.menus'] = array('main' => 'my_main_menu');*/ - - $app['template']->assign('content', $items); - $app['page_controller']->getSectionCourseBlock(); $app['page_controller']->return_profile_block(); $app['page_controller']->return_user_image_block(); $app['page_controller']->return_course_block($filter); - - $app['template']->assign('navigation_course_links', $app['template']->returnNavigationLinks()); $app['page_controller']->return_reservation_block(); + $app['page_controller']->returnNavigationLinks($app['template']->getNavigationLinks()); + $app['template']->assign('search_block', $app['page_controller']->return_search_block()); $app['template']->assign('classes_block', $app['page_controller']->return_classes_block()); $app['page_controller']->return_skills_links();