diff --git a/extensions/libs/views/helpers/infinitas.php b/extensions/libs/views/helpers/infinitas.php index 12bafbef2..330a2b7ef 100644 --- a/extensions/libs/views/helpers/infinitas.php +++ b/extensions/libs/views/helpers/infinitas.php @@ -13,20 +13,33 @@ function loadModules($position = null){ $modules = ClassRegistry::init('Management.Module')->getModules($position); $out = '
'; + $currentRoute = Router::currentRoute(); + foreach($modules as $module){ - $out .= '
'; + $moduleOut = '
'; if ($module['Module']['show_heading']) { - $out .= '

'.__($module['Module']['name'],true).'

'; + $moduleOut .= '

'.__($module['Module']['name'],true).'

'; } if (!empty($module['Module']['module'])) { $View = ClassRegistry::getObject('view'); - $out .= $View->element('modules/'.$module['Module']['module']); + $moduleOut .= $View->element('modules/'.$module['Module']['module']); } else if (!empty($module['Module']['content'])) { - $out .= $module['Module']['content']; + $moduleOut .= $module['Module']['content']; + } + $moduleOut .= '
'; + + if (!empty($module['Route']) && is_object($currentRoute)){ + foreach($module['Route'] as $route){ + if ($route['url'] == $currentRoute->template) { + $out .= $moduleOut; + } } - $out .= '
'; + } + else if (empty($module['Route'])) { + $out .= $moduleOut; + } } $out .= '
';