diff --git a/templates/themes/categories/frames.html b/templates/themes/categories/frames.html index e35264c5..4eee505a 100644 --- a/templates/themes/categories/frames.html +++ b/templates/themes/categories/frames.html @@ -65,7 +65,7 @@ {{ settings.title }} - {{ include(settings.file_sidebar) }} - {{ include(settings.file_news) }} + {% include 'themes/categories/' ~ settings.file_sidebar %} + {% include 'themes/categories/' ~ settings.file_news %} diff --git a/templates/themes/categories/theme.php b/templates/themes/categories/theme.php index 1ccfe451..3731badb 100644 --- a/templates/themes/categories/theme.php +++ b/templates/themes/categories/theme.php @@ -28,8 +28,15 @@ // Build homepage public static function homepage($settings) { global $config; - - return Element('themes/categories/frames.html', Array('config' => $config, 'settings' => $settings)); + + return Element( + 'themes/categories/frames.html', + Array( + 'config' => $config, + 'settings' => $settings, + 'categories' => Categories::getCategories($config) + ) + ); } // Build news page @@ -51,6 +58,14 @@ public static function sidebar($settings) { global $config, $board; + return Element('themes/categories/sidebar.html', Array( + 'settings' => $settings, + 'config' => $config, + 'categories' => Categories::getCategories($config) + )); + } + + private static function getCategories($config) { $categories = $config['categories']; foreach ($categories as &$boards) { @@ -61,13 +76,9 @@ $board = Array('title' => $title, 'uri' => sprintf($config['board_path'], $board)); } } - - return Element('themes/categories/sidebar.html', Array( - 'settings' => $settings, - 'config' => $config, - 'categories' => $categories - )); - } + + return $categories; + } }; ?>