diff --git a/inc/config.php b/inc/config.php index 0ecfc7b9..f457e004 100644 --- a/inc/config.php +++ b/inc/config.php @@ -1246,6 +1246,7 @@ // Location of files. $config['file_index'] = 'index.html'; + $config['file_catalog'] = 'catalog.html'; // Catalog page (used in preg_match for post referer) $config['file_page'] = '%d.html'; // NB: page is both an index page and a thread $config['file_page50'] = '%d+50.html'; $config['file_page_slug'] = '%d-%s.html'; diff --git a/inc/functions.php b/inc/functions.php index a82dcd64..8ec8c739 100755 --- a/inc/functions.php +++ b/inc/functions.php @@ -178,6 +178,7 @@ function loadConfig() { str_replace('%s', $config['board_regex'], preg_quote($config['board_path'], '/')) . '(' . preg_quote($config['file_index'], '/') . '|' . + preg_quote($config['file_catalog'], '/') . '|' . str_replace('%d', '\d+', preg_quote($config['file_page'])) . ')?' . '|' . diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html index 647f3011..a7e992fe 100644 --- a/templates/themes/catalog/catalog.html +++ b/templates/themes/catalog/catalog.html @@ -5,18 +5,20 @@ {% include 'header.html' %} - {{ board }} - Catalog + {{ board_name }} - Catalog {{ boardlist.top }}
-

{{ settings.title }} (/{{ board }}/)

+

{{ settings.title }} (/{{ board_name }}/)

{{ settings.subtitle }}
+ {% include 'post_form.html' %} + {% trans 'Sort by' %}: