badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[tags] fully separate tag_list and tag_categories, see #1103

Browse source
This commit is contained in:
Shish 2024-03-13 23:34:33 +00:00 committed by Shish
parent cefd48e94f
commit cc8e4ffd47
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ext/tag_categories/theme.php
View file

@ -103,6 +103,9 @@ class TagCategoriesTheme extends Themelet
'; ';
// add html to stuffs // add html to stuffs
$page->set_title("Tag Categories");
$page->set_heading("Tag Categories");
$page->add_block(new NavBlock());
$page->add_block(new Block("Editing", $html, "main", 10)); $page->add_block(new Block("Editing", $html, "main", 10));
} }

8
ext/tag_list/main.php
View file

@ -53,21 +53,25 @@ class TagList extends Extension
} }
switch ($sub) { switch ($sub) {
default:
case 'map': case 'map':
$this->theme->set_heading("Tag Map"); $this->theme->set_heading("Tag Map");
$this->theme->set_tag_list($this->build_tag_map($starts_with, $tags_min)); $this->theme->set_tag_list($this->build_tag_map($starts_with, $tags_min));
$this->theme->display_page($page);
break; break;
case 'alphabetic': case 'alphabetic':
$this->theme->set_heading("Alphabetic Tag List"); $this->theme->set_heading("Alphabetic Tag List");
$this->theme->set_tag_list($this->build_tag_alphabetic($starts_with, $tags_min)); $this->theme->set_tag_list($this->build_tag_alphabetic($starts_with, $tags_min));
$this->theme->display_page($page);
break; break;
case 'popularity': case 'popularity':
$this->theme->set_heading("Tag List by Popularity"); $this->theme->set_heading("Tag List by Popularity");
$this->theme->set_tag_list($this->build_tag_popularity($tags_min)); $this->theme->set_tag_list($this->build_tag_popularity($tags_min));
$this->theme->display_page($page);
break;
default:
// don't display anything
break; break;
} }
$this->theme->display_page($page);
} elseif ($event->page_matches("tags")) { } elseif ($event->page_matches("tags")) {
$page->set_mode(PageMode::REDIRECT); $page->set_mode(PageMode::REDIRECT);
$page->set_redirect(make_link("tags/map")); $page->set_redirect(make_link("tags/map"));

5
ext/tag_list/test.php
View file

@ -7,7 +7,7 @@ namespace Shimmie2;
class TagListTest extends ShimmiePHPUnitTestCase class TagListTest extends ShimmiePHPUnitTestCase
{ {
/** @var string[] */ /** @var string[] */
private array $pages = ["map", "alphabetic", "popularity", "categories"]; private array $pages = ["map", "alphabetic", "popularity"];
public function testTagList(): void public function testTagList(): void
{ {
@ -20,9 +20,6 @@ class TagListTest extends ShimmiePHPUnitTestCase
$this->get_page('tags/popularity'); $this->get_page('tags/popularity');
$this->assert_title('Tag List'); $this->assert_title('Tag List');
$this->get_page('tags/categories');
$this->assert_title('Tag List');
# FIXME: test that these show the right stuff # FIXME: test that these show the right stuff
} }