diff --git a/templates/themes/categories/frames.html b/templates/themes/categories/frames.html index 25de9841..4659e360 100644 --- a/templates/themes/categories/frames.html +++ b/templates/themes/categories/frames.html @@ -4,16 +4,77 @@ - - - {{ settings.title }} + + + {{ settings.title }} - - + {% include 'themes/categories/' ~ settings.file_sidebar %} + {% include 'themes/categories/' ~ settings.file_news %} diff --git a/templates/themes/categories/news.html b/templates/themes/categories/news.html index dc6387c5..e0c1e4a6 100644 --- a/templates/themes/categories/news.html +++ b/templates/themes/categories/news.html @@ -1,18 +1,11 @@ {% filter remove_whitespace %} - - - - - {{ settings.title }} - - - - {{ boardlist.top }} +{{ boardlist.top }} +

{{ settings.title }}

{{ settings.subtitle }}
- +
{% if not news %}

{% trans %}(No news to show.){% endtrans %}

@@ -30,13 +23,12 @@ {% endfor %} {% endif %}
- - - - + + +
{% endfilter %} diff --git a/templates/themes/categories/sidebar.html b/templates/themes/categories/sidebar.html index 83199f8c..7552dd91 100644 --- a/templates/themes/categories/sidebar.html +++ b/templates/themes/categories/sidebar.html @@ -1,21 +1,5 @@ {% filter remove_whitespace %} - - - - - - {{ settings.title }} - - - - - +
{{ settings.title }}
{% endfor %} - - +
+ {% endfilter %} diff --git a/templates/themes/categories/theme.php b/templates/themes/categories/theme.php index 1ccfe451..14072bcc 100644 --- a/templates/themes/categories/theme.php +++ b/templates/themes/categories/theme.php @@ -28,8 +28,17 @@ // 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), + 'boardlist' => createBoardlist(false) + + ) + ); } // Build news page @@ -43,7 +52,7 @@ 'settings' => $settings, 'config' => $config, 'news' => $news, - 'boardlist' => createBoardlist(false) + 'boardlist' => createBoardlist(false) )); } @@ -51,6 +60,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,12 +78,8 @@ $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; } };