flashii/misuzu
flashii/misuzu
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prep for category accent colours.

Browse source
This commit is contained in:
flash 2018-10-16 23:38:17 +02:00
parent c3b1e52491
commit 9f9b602e75
4 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
database/2018_10_16_211910_add_forum_accent_colours.php Normal file
View file

@ -0,0 +1,20 @@
<?php
namespace Misuzu\DatabaseMigrations\AddForumAccentColours;
use PDO;
function migrate_up(PDO $conn): void
{
$conn->exec("
ALTER TABLE `msz_forum_categories`
ADD COLUMN `forum_colour` INT UNSIGNED NULL DEFAULT NULL AFTER `forum_description`;
");
}
function migrate_down(PDO $conn): void
{
$conn->exec('
ALTER TABLE `msz_forum_categories`
DROP COLUMN `forum_colour`;
');
}

8
src/Forum/forum.php
View file

@ -45,6 +45,7 @@ define('MSZ_FORUM_ROOT_DATA', [ // should be compatible with the data fetched in
'forum_name' => 'Forums', 'forum_name' => 'Forums',
'forum_children' => 0, 'forum_children' => 0,
'forum_type' => MSZ_FORUM_TYPE_CATEGORY, 'forum_type' => MSZ_FORUM_TYPE_CATEGORY,
'forum_colour' => null,
]); ]);
function forum_may_have_children(int $forumType): bool function forum_may_have_children(int $forumType): bool
@ -61,7 +62,8 @@ function forum_fetch(int $forumId): array
{ {
$getForum = db_prepare(' $getForum = db_prepare('
SELECT SELECT
`forum_id`, `forum_name`, `forum_type`, `forum_link`, `forum_link_clicks`, `forum_parent`, `forum_id`, `forum_name`, `forum_type`, `forum_link`,
`forum_link_clicks`, `forum_parent`, `forum_colour`,
( (
SELECT COUNT(`topic_id`) SELECT COUNT(`topic_id`)
FROM `msz_forum_topics` FROM `msz_forum_topics`
@ -87,7 +89,7 @@ function forum_get_root_categories(int $userId): array
$getCategories = db_prepare(" $getCategories = db_prepare("
SELECT SELECT
f.`forum_id`, f.`forum_name`, f.`forum_type`, f.`forum_id`, f.`forum_name`, f.`forum_type`, f.`forum_colour`,
( (
SELECT COUNT(`forum_id`) SELECT COUNT(`forum_id`)
FROM `msz_forum_categories` as sf FROM `msz_forum_categories` as sf
@ -239,7 +241,7 @@ define(
SELECT SELECT
:user_id as `target_user_id`, :user_id as `target_user_id`,
f.`forum_id`, f.`forum_name`, f.`forum_description`, f.`forum_type`, f.`forum_id`, f.`forum_name`, f.`forum_description`, f.`forum_type`,
f.`forum_link`, f.`forum_link_clicks`, f.`forum_archived`, f.`forum_link`, f.`forum_link_clicks`, f.`forum_archived`, f.`forum_colour`,
t.`topic_id` as `recent_topic_id`, p.`post_id` as `recent_post_id`, t.`topic_id` as `recent_topic_id`, p.`post_id` as `recent_post_id`,
t.`topic_title` as `recent_topic_title`, t.`topic_bumped` as `recent_topic_bumped`, t.`topic_title` as `recent_topic_title`, t.`topic_bumped` as `recent_topic_bumped`,
p.`post_created` as `recent_post_created`, p.`post_created` as `recent_post_created`,

2
templates/forum/index.twig
View file

@ -8,7 +8,7 @@
{% if not forum_empty %} {% if not forum_empty %}
{% for category in forum_categories %} {% for category in forum_categories %}
{% if category.forum_children > 0 %} {% if category.forum_children > 0 %}
{{ forum_category_listing(category.forum_subforums, category.forum_name) }} {{ forum_category_listing(category.forum_subforums, category.forum_name, category.forum_colour) }}
{% endif %} {% endif %}
{% endfor %} {% endfor %}

4
templates/forum/macros.twig
View file

@ -1,7 +1,7 @@
{% macro forum_category_listing(forums, title) %} {% macro forum_category_listing(forums, title, colour) %}
{% from _self import forum_category_entry %} {% from _self import forum_category_entry %}
<div class="container container--new forum__categories"> <div class="container container--new forum__categories"{% if colour is not null %} style="{{ colour|html_colour('--accent-colour') }}"{% endif %}>
<div class="container__title">{{ title }}</div> <div class="container__title">{{ title }}</div>
{% if forums|length > 0 %} {% if forums|length > 0 %}