Skip to content

Some fixes #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Klap-in wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

Some fixes #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8f7e02a
replace sort by the sort in pagelist
Klap-in Aug 19, 2023
b504f6d
Make title of tagpage translatable
Klap-in Aug 19, 2023
192775e
code reformatting
Klap-in Aug 19, 2023
bf27ea7
Fixes rtl issues
Klap-in Aug 19, 2023
ef93eb2
sort tag cloud by tag name
Klap-in Aug 19, 2023
5871336
replace trim() by str_replace for cleaning U+200b (zero width space)
Klap-in Aug 25, 2023
406c399
add class `tag_count_table` to the count table
Klap-in Aug 28, 2023
d62d791
only on table, not rows
Klap-in Aug 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 15 additions & 16 deletions action.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,35 +15,35 @@ class action_plugin_tag extends DokuWiki_Action_Plugin {
* @param Doku_Event_Handler $controller
*/
public function register(Doku_Event_Handler $controller) {
$controller->register_hook('ACTION_ACT_PREPROCESS', 'BEFORE', $this, 'catchTagAction', array());
$controller->register_hook('TPL_ACT_UNKNOWN', 'BEFORE', $this, 'performTagAction', array());
$controller->register_hook('TPL_METAHEADER_OUTPUT', 'BEFORE', $this, 'beautifyKeywordsInMetaHeader', array());
$controller->register_hook('ACTION_ACT_PREPROCESS', 'BEFORE', $this, 'catchTagAction');
$controller->register_hook('TPL_ACT_UNKNOWN', 'BEFORE', $this, 'performTagAction');
$controller->register_hook('TPL_METAHEADER_OUTPUT', 'BEFORE', $this, 'beautifyKeywordsInMetaHeader');
if($this->getConf('toolbar_icon')) {
$controller->register_hook('TOOLBAR_DEFINE', 'AFTER', $this, 'insertToolbarButton', array ());
$controller->register_hook('TOOLBAR_DEFINE', 'AFTER', $this, 'insertToolbarButton');
}
$controller->register_hook('INDEXER_VERSION_GET', 'BEFORE', $this, 'setTagIndexversion', array());
$controller->register_hook('INDEXER_PAGE_ADD', 'BEFORE', $this, 'addTagsToIndex', array());
$controller->register_hook('INDEXER_VERSION_GET', 'BEFORE', $this, 'setTagIndexversion');
$controller->register_hook('INDEXER_PAGE_ADD', 'BEFORE', $this, 'addTagsToIndex');
}

/**
* Add a version string to the index so it is rebuilt
* whenever the stored data format changes.
*/
public function setTagIndexversion(Doku_Event $event, $param) {
public function setTagIndexversion(Doku_Event $event) {
global $conf;
$event->data['plugin_tag'] = '0.2.deaccent='.$conf['deaccent'];
}

/**
* Add all data of the subject metadata to the metadata index.
*/
public function addTagsToIndex(Doku_Event $event, $param) {
public function addTagsToIndex(Doku_Event $event) {
/* @var helper_plugin_tag $helper */
if ($helper = $this->loadHelper('tag')) {
// make sure the tags are cleaned and no duplicate tags are added to the index
$tags = p_get_metadata($event->data['page'], 'subject');
if (!is_array($tags)) {
$event->data['metadata']['subject'] = array();
$event->data['metadata']['subject'] = [];
} else {
$event->data['metadata']['subject'] = $helper->cleanTagList($tags);
}
Expand All @@ -55,7 +55,7 @@ public function addTagsToIndex(Doku_Event $event, $param) {
*
* @author Michael Klier <chi@chimeric.de>
*/
public function catchTagAction(Doku_Event $event, $param) {
public function catchTagAction(Doku_Event $event) {
if($event->data != 'showtag') return;
$event->preventDefault();
}
Expand All @@ -64,10 +64,9 @@ public function catchTagAction(Doku_Event $event, $param) {
* Display the tag page
*
* @param Doku_Event $event The TPL_ACT_UNKNOWN event
* @param array $param optional parameters (unused)
* @return void
*/
public function performTagAction(Doku_Event $event, $param) {
public function performTagAction(Doku_Event $event) {
global $lang, $INPUT;

if($event->data != 'showtag') return;
Expand Down Expand Up @@ -98,10 +97,10 @@ public function performTagAction(Doku_Event $event, $param) {
$pagelist->addPage($page);
}

print '<h1>TAG: ' . hsc(str_replace('_', ' ', $INPUT->str('tag'))) . '</h1>' . DOKU_LF;
print '<div class="level1">' . DOKU_LF;
print '<h1>'. sprintf($this->getLang('tagpageheading'), hsc(str_replace('_', ' ', $INPUT->str('tag')))) . '</h1>';
print '<div class="level1">';
print $pagelist->finishList();
print '</div>' . DOKU_LF;
print '</div>';

} else {
print '<div class="level1"><p>' . $lang['nothingfound'] . '</p></div>';
Expand All @@ -111,7 +110,7 @@ public function performTagAction(Doku_Event $event, $param) {
/**
* Inserts the tag toolbar button
*/
public function insertToolbarButton(Doku_Event $event, $param) {
public function insertToolbarButton(Doku_Event $event) {
$event->data[] = array(
'type' => 'format',
'title' => $this->getLang('toolbar_icon'),
Expand Down
Loading