From c9d5d295d59735064e5aae76343d9d62a1a460c1 Mon Sep 17 00:00:00 2001 From: lastlink Date: Mon, 19 Aug 2024 08:15:27 -0400 Subject: [PATCH 01/50] add more tests --- Test/Model/WikiModelTest.php | 134 +++++++++++++++++++++++++++++++++++ 1 file changed, 134 insertions(+) diff --git a/Test/Model/WikiModelTest.php b/Test/Model/WikiModelTest.php index 8ee92e9..0b77855 100644 --- a/Test/Model/WikiModelTest.php +++ b/Test/Model/WikiModelTest.php @@ -137,4 +137,138 @@ public function testReOrderByIndex(){ $this->assertEquals($expectedColumnOrders[$wikiPages[$i]['id']-1], $wikiPages[$i]['ordercolumn'], 'Failed to reorder page id:'. $wikiPages[$i]['id']); } } + + + + public function testGetEditionsReturnsArray() + { + $this->db + ->expects($this->once()) + ->method('table') + ->with(WikiModel::WIKI_EDITION_TABLE) + ->willReturnSelf(); + + $this->db + ->method('eq') + ->with('wikipage_id', 123) + ->willReturnSelf(); + + $this->db + ->method('desc') + ->with('edition') + ->willReturnSelf(); + + $expected = [ + ['id' => 1, 'content' => 'test'] + ]; + + $this->db + ->method('findAll') + ->willReturn($expected); + + $result = $this->wikiModel->getEditions(123); + + $this->assertSame($expected, $result); + } + + public function testCreatePageSavesCorrectly() + { + $this->db + ->expects($this->once()) + ->method('table') + ->with(WikiModel::WIKITABLE) + ->willReturnSelf(); + + $this->db + ->method('persist') + ->willReturn(1); + + $result = $this->wikiModel->createpage(1, 'Test title', 'Test content'); + + $this->assertEquals(1, $result); + } + + public function testUpdatePageUpdatesCorrectly() + { + $this->db + ->expects($this->once()) + ->method('table') + ->with(WikiModel::WIKITABLE) + ->willReturnSelf(); + + $this->db + ->method('eq') + ->with('id', 1) + ->willReturnSelf(); + + $this->db + ->method('update') + ->willReturn(true); + + $result = $this->wikiModel->updatepage(['title' => 'New Title', 'content' => 'New content', 'id' => 1], 1); + + $this->assertEquals(1, $result); + } + + public function testRemovePageRemovesCorrectly() + { + $this->db + ->expects($this->once()) + ->method('table') + ->with(WikiModel::WIKITABLE) + ->willReturnSelf(); + + $this->db + ->method('eq') + ->with('id', 1) + ->willReturnSelf(); + + $this->db + ->method('remove') + ->willReturn(true); + + $result = $this->wikiModel->removepage(1); + + $this->assertTrue($result); + } + + public function testGetWikipageReturnsCorrectData() + { + $this->db + ->expects($this->once()) + ->method('table') + ->with(WikiModel::WIKITABLE) + ->willReturnSelf(); + + $this->db + ->method('columns') + ->willReturnSelf(); + + $this->db + ->method('eq') + ->with('id', 1) + ->willReturnSelf(); + + $expected = ['id' => 1, 'title' => 'Test']; + + $this->db + ->method('findOne') + ->willReturn($expected); + + $result = $this->wikiModel->getWikipage(1); + + $this->assertSame($expected, $result); + } + + public function testGetWikipageThrowsPageNotFoundException() + { + $this->db + ->method('findOne') + ->willReturn(null); + + $this->expectException(\Kanboard\Core\Controller\PageNotFoundException::class); + + $this->wikiModel->getWiki(); + } + } From 3cc3091d4e53e6e7b8ac35686e3629fd2dfceaef Mon Sep 17 00:00:00 2001 From: lastlink Date: Mon, 19 Aug 2024 08:16:35 -0400 Subject: [PATCH 02/50] add more tests --- Test/Model/WikiModelTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Test/Model/WikiModelTest.php b/Test/Model/WikiModelTest.php index 0b77855..b081d5f 100644 --- a/Test/Model/WikiModelTest.php +++ b/Test/Model/WikiModelTest.php @@ -266,7 +266,7 @@ public function testGetWikipageThrowsPageNotFoundException() ->method('findOne') ->willReturn(null); - $this->expectException(\Kanboard\Core\Controller\PageNotFoundException::class); + $this->expectException(\Kanboard\Core\ExternalTask\NotFoundException::class); $this->wikiModel->getWiki(); } From 7cb7cf303f3f8356fafc2cfee4e2940f6e2f5bec Mon Sep 17 00:00:00 2001 From: lastlink Date: Mon, 19 Aug 2024 08:26:25 -0400 Subject: [PATCH 03/50] another try --- Test/Model/WikiModelTest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Test/Model/WikiModelTest.php b/Test/Model/WikiModelTest.php index b081d5f..1b58423 100644 --- a/Test/Model/WikiModelTest.php +++ b/Test/Model/WikiModelTest.php @@ -139,7 +139,7 @@ public function testReOrderByIndex(){ } - + /* public function testGetEditionsReturnsArray() { $this->db @@ -170,6 +170,7 @@ public function testGetEditionsReturnsArray() $this->assertSame($expected, $result); } + */ public function testCreatePageSavesCorrectly() { From d3a91eb8a86ec3ff81a1590f8ac9323d8eccb500 Mon Sep 17 00:00:00 2001 From: lastlink Date: Mon, 19 Aug 2024 08:31:00 -0400 Subject: [PATCH 04/50] take 3 --- Test/Model/WikiModelTest.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Test/Model/WikiModelTest.php b/Test/Model/WikiModelTest.php index 1b58423..902de30 100644 --- a/Test/Model/WikiModelTest.php +++ b/Test/Model/WikiModelTest.php @@ -19,6 +19,15 @@ class WikiModelTest extends Base protected function setUp(): void { parent::setUp(); + + $this->db = $this->createMock(\PicoDb\Database::class); + $this->container = $this->createMock(\Psr\Container\ContainerInterface::class); + + // $this->container + // ->method('get') + // ->willReturnMap([ + // [\PicoDb\Database::class, $this->db] + // ]); // $this->plugin = new Plugin($this->container); $plugin = new Loader($this->container); From 3f55331fd4f8bbb969733f800856b8cbb9cd9553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alfred=20B=C3=BChler?= Date: Tue, 8 Oct 2024 09:02:52 +0200 Subject: [PATCH 05/50] Added locale de_DE_du --- ChangeLog | 5 +++ Locale/de_DE_du/translations.php | 54 ++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 Locale/de_DE_du/translations.php diff --git a/ChangeLog b/ChangeLog index 5227e4b..5874681 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Version 0.3.9 +Bug fixes: + +* Fix https://github.com/funktechno/kanboard-plugin-wiki/issues/99 + Version 0.3.8 Improvements: diff --git a/Locale/de_DE_du/translations.php b/Locale/de_DE_du/translations.php new file mode 100644 index 0000000..71d15bb --- /dev/null +++ b/Locale/de_DE_du/translations.php @@ -0,0 +1,54 @@ + 'Stundensatz entfernen', + 'Do you really want to remove this hourly rate?' => 'Diesen Stundensatz wirklich entfernen?', + 'Hourly rate' => 'Stundensatz', + 'Effective date' => 'Inkraftsetzung', + 'Add new rate' => 'Neue Rate hinzufügen', + 'Rate removed successfully.' => 'Rate erfolgreich entfernt', + 'Unable to remove this rate.' => 'Nicht in der Lage, diese Rate zu entfernen.', + 'Unable to save the hourly rate.' => 'Nicht in der Lage, diese Rate zu speichern', + 'Hourly rate created successfully.' => 'Stundensatz erfolgreich angelegt.', + 'Amount' => 'Betrag', + 'Wiki' => 'Wiki', + 'Wiki line' => 'Wikilinie', + 'Wiki line removed successfully.' => 'Wikilinie erfolgreich entfernt', + 'Wiki lines' => 'Wikilinien', + 'Cost' => 'Kosten', + 'Cost breakdown' => 'Kostenaufschlüsselung', + 'Do you really want to remove this wiki page?' => 'Soll diese Wikilinie wirklich entfernt werden?', + 'Expenses' => 'Kosten', + 'New Wiki page' => 'Neue Wikilinie', + 'Remove a wiki line' => 'Wikilinie entfernen', + 'Remove wiki line' => 'Wikilinie entfernen', + 'The wiki line have been created successfully.' => 'Die Wikilinie wurde erfolgreich angelegt.', + 'Unable to create the wiki line.' => 'Wikilinie konnte nicht erstellt werden.', + 'Unable to remove this wiki page.' => 'Wikilinie konnte nicht gelöscht werden.', + 'Remaining' => 'Verbleibend', + 'Currency rates are used to calculate project wiki.' => 'Währungskurse werden verwendet, um das Projektwiki zu berechnen.', + 'Burndown chart for "%s"' => 'Burn-Down-Chart für "%s"', + 'Wiki overview' => 'Wiki-Übersicht', + 'Type' => 'Typ', + 'There is not enough data to show something.' => 'Es sind nicht genügend Daten vorhanden, um irgendetwas anzuzeigen.', + 'Created' => 'Erstellt', + 'Last modifier' => 'Letzter Bearbeiter', + 'Modified' => 'Geändert', + 'Edit page' => 'Seite bearbeiten', + 'View Editions' => 'Bearbeitungen anzeigen', + 'Creator' => 'Ersteller', + 'Modifier' => 'Bearbeiter', + 'Editions' => 'Bearbeitungen', + 'Current Edition' => 'Aktuelle Bearbeitung', + 'Date Creation' => 'Erstellungs-Datum', + 'Date Modification' => 'Änderungs-Datum', + 'Content' => 'Inhalt', + 'Date Created' => 'Erstellungsdatum', + 'Date Modified' => 'Änderungsdatum', + '%d Wiki pages' => '%d Wiki-Seiten', + 'Search by content' => 'Suche nach Inhalt', + 'Wiki page Title' => 'Wikiseiten-Titel', + 'There are no editions for this Wiki page saved to restore.' => 'Es sind keine Bearbeitungen zur Wiederherstellung für diese Wiki-Seite gespeichert.', + 'There are no Wiki pages that you have access to.' => 'Es gibt keine Wiki-Seiten, auf die Du Zugriff hast.', + 'There are no Wiki pages for this project.' => 'Es gibt keine Wiki-Seiten für dieses Projekt.' +); From f0d16df66ef08a513987813af98e757d861f1449 Mon Sep 17 00:00:00 2001 From: "Im[F(x)]" Date: Tue, 29 Oct 2024 12:57:25 +0200 Subject: [PATCH 06/50] * adding 'Project' to wiki list details --- Template/wiki_list/wiki_details.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Template/wiki_list/wiki_details.php b/Template/wiki_list/wiki_details.php index c5fe43a..e0a6a73 100644 --- a/Template/wiki_list/wiki_details.php +++ b/Template/wiki_list/wiki_details.php @@ -1,5 +1,7 @@
    +
  • : model->projectModel->getById($wiki['project_id'])['name']?>
    • + 0): ?>
  • : text->e($wiki['creator_name'] ?: $wiki['creator_username'])?>
    • From cfee926ddb430502a2c8bb70ad0da23548115196 Mon Sep 17 00:00:00 2001 From: "Im[F(x)]" Date: Tue, 29 Oct 2024 12:59:23 +0200 Subject: [PATCH 07/50] * fixed the new line symbol in images info tooltip --- Template/wiki_file/images.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Template/wiki_file/images.php b/Template/wiki_file/images.php index 1767578..d9ff10c 100644 --- a/Template/wiki_file/images.php +++ b/Template/wiki_file/images.php @@ -31,7 +31,7 @@
- dt->datetime($file['date'])).'
'.t('Size: %s', $this->text->bytes($file['size'])) ?>'> + dt->datetime($file['date'])).' '.t('Size: %s', $this->text->bytes($file['size'])) ?>'> From 3957f88b1b3000ce7db11c55588d9ffdace74163 Mon Sep 17 00:00:00 2001 From: "Im[F(x)]" Date: Tue, 29 Oct 2024 13:04:25 +0200 Subject: [PATCH 08/50] * removed redundant parameter `no_layout` * adjusted all titles of pages to show the project name * removed obsolete references to 'wiki:wiki/sidebar' template in WikiController --- Controller/WikiController.php | 38 +++++++++++++++-------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/Controller/WikiController.php b/Controller/WikiController.php index 4da7b37..c04474c 100755 --- a/Controller/WikiController.php +++ b/Controller/WikiController.php @@ -65,11 +65,10 @@ public function readonly() $this->response->html($this->helper->layout->app('wiki:wiki/show', array( 'project' => $project, - 'no_layout' => true, 'not_editable' => true, - 'title' => $project['name'] .= " ". t('Wiki'), + 'title' => $project['name'], 'wikipages' => $this->wikiModel->getWikipages($project['id']), - ), 'wiki:wiki/sidebar')); + ))); } /** @@ -85,9 +84,9 @@ public function show() $this->response->html($this->helper->layout->app('wiki:wiki/show', array( 'project' => $project, - 'title' => $project['name'] .= " ". t('Wiki'), + 'title' => $project['name'], 'wikipages' => $this->wikiModel->getWikipages($project['id']), - ), 'wiki:wiki/sidebar')); + ))); // ,array( // 'wikipages' => $this->wikiModel->getWikipages($project['id']) @@ -106,12 +105,12 @@ public function editions() // restore button use undo - $this->response->html($this->helper->layout->project('wiki:wiki/editions', array( + $this->response->html($this->helper->layout->app('wiki:wiki/editions', array( 'project' => $project, - 'title' => t('Wiki Editions'), + 'title' => $project['name'], 'wiki_id'=> $wiki_id, 'editions' => $this->wikiModel->getEditions($wiki_id), - ), 'wiki:wiki/sidebar')); + ))); } @@ -144,7 +143,7 @@ public function edit(array $values = array(), array $errors = array()) 'errors' => $errors, 'wiki_list' => $wiki_list, 'title' => t('Edit Wikipage'), - ), 'wiki:wiki/sidebar')); + ))); } public function detail_readonly() { @@ -174,17 +173,16 @@ public function detail_readonly() { // use a wiki helper for better side bar TODO: $this->response->html($this->helper->layout->app('wiki:wiki/detail', array( 'project' => $project, - 'title' => t('Wikipage'), + 'title' => $project['name'], 'wiki_id' => $wiki_id, 'wiki' => $wikipage, - 'no_layout' => true, 'not_editable' => true, 'files' => $this->wikiFileModel->getAllDocuments($wiki_id), 'images' => $this->wikiFileModel->getAllImages($wiki_id), // 'wikipage' => $this->wikiModel->getWikipage($wiki_id), 'wikipage' => $wikipage, 'wikipages' => $wikipages, - ), 'wiki:wiki/sidebar')); + ))); } function getNestedChildren($parent_id, $items) { @@ -212,15 +210,12 @@ public function detail() $wikipages = $this->wikiModel->getWikipages($project['id']); $wikiPagesResult = array(); - foreach ($wikipages as $page) { if (t($wiki_id) == t($page['id'])) { $wikipage = $page; } if(!isset($page['parent_id'])){ - $page['children'] = $this->getNestedChildren($page['id'], $wikipages); - array_push($wikiPagesResult, $page); } } @@ -233,15 +228,14 @@ public function detail() // use a wiki helper for better side bar TODO: $this->response->html($this->helper->layout->app('wiki:wiki/detail', array( 'project' => $project, - 'title' => t('Wikipage'), + 'title' => $project['name'], 'wiki_id' => $wiki_id, 'wiki' => $wikipage, 'files' => $this->wikiFileModel->getAllDocuments($wiki_id), 'images' => $this->wikiFileModel->getAllImages($wiki_id), - // 'wikipage' => $this->wikiModel->getWikipage($wiki_id), 'wikipage' => $wikipage, 'wikipages' => $wikiPagesResult, - ), 'wiki:wiki/sidebar')); + ))); // $wikipage= $wikipages->select(1)->eq('id', $wiki_id)->findOne(); @@ -249,12 +243,12 @@ public function detail() // $this->response->html($this->helper->layout->project('wiki:wiki/detail', array( // 'project' => $project, - // 'title' => t('Wikipage'), + // 'title' => $project['name'], // 'wiki_id' => $wiki_id, // // 'wikipage' => $this->wikiModel->getWikipage($wiki_id), // 'wikipage' => $wikipage, // 'wikipages' => $wikipages, - // ), 'wiki:wiki/sidebar')); + // ))); // ,array( // 'wikipages' => $this->wikiModel->getWikipages($project['id']) @@ -277,7 +271,7 @@ public function detail() // 'paginator' => $paginator, // 'project' => $project, // 'title' => t('Wiki'), - // ), 'wiki:wiki/sidebar')); + // ))); // } /** @@ -428,7 +422,7 @@ public function create(array $values = array(), array $errors = array()) 'errors' => $errors, 'project' => $project, 'title' => t('Wikipage'), - ), 'wiki:wiki/sidebar')); + ))); } /** From 02e3763203042e082092cc52834e1cd2c0bb9b69 Mon Sep 17 00:00:00 2001 From: "Im[F(x)]" Date: Tue, 29 Oct 2024 13:05:53 +0200 Subject: [PATCH 09/50] * adjusted elements in create/edit wiki page modals --- Template/wiki/create.php | 1 + Template/wiki/edit.php | 26 ++++++++++++++------------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Template/wiki/create.php b/Template/wiki/create.php index 149d1f5..254f864 100644 --- a/Template/wiki/create.php +++ b/Template/wiki/create.php @@ -11,6 +11,7 @@ form->label(t('Title'), 'title') ?> form->text('title', $values, $errors, array('required', 'maxlength="255"', 'autofocus', 'tabindex="1"')) ?> +

form->label(t('Content'), 'content') ?> form->textEditor('content', $values, $errors) ?> diff --git a/Template/wiki/edit.php b/Template/wiki/edit.php index c6cb940..1cd51a1 100644 --- a/Template/wiki/edit.php +++ b/Template/wiki/edit.php @@ -2,21 +2,23 @@

-
- form->csrf()?> + + form->csrf() ?> - form->hidden('id', $values)?> - form->hidden('editions', $values)?> - form->hidden('order', $values)?> + form->hidden('id', $values) ?> + form->hidden('editions', $values) ?> + form->hidden('order', $values) ?> - form->label(t('Title'), 'title')?> - form->text('title', $values, $errors, array('required', 'maxlength="255"', 'autofocus', 'tabindex="1"'))?> + form->label(t('Title'), 'title') ?> + form->text('title', $values, $errors, array('required', 'maxlength="255"', 'autofocus', 'tabindex="1"')) ?> +
- form->label(t('is a child of'), 'is a child of')?> - form->select('parent_id', $wiki_list, $values, $errors) ?> + form->label(t('is a child of'), 'is a child of') ?> + form->select('parent_id', $wiki_list, $values, $errors) ?> - form->label(t('Content'), 'content')?> - form->textEditor('content', $values, $errors)?> +

+ form->label(t('Content'), 'content') ?> + form->textEditor('content', $values, $errors) ?> - modal->submitButtons()?> + modal->submitButtons() ?>
From 1f453553ed2144d56fabdad767d96bdbf03081cd Mon Sep 17 00:00:00 2001 From: "Im[F(x)]" Date: Tue, 29 Oct 2024 13:13:28 +0200 Subject: [PATCH 10/50] * reusing the `wiki/sidebar` template to show wiki links and contents in a sidebar when showing wiki page details and editions * the sidebar is also horizontally resizable now * the original KB styles for sidebar/container/content replace the inline hardcoded clearfix styles --- Controller/WikiController.php | 21 +++++++-- Template/wiki/detail.php | 86 +++++++---------------------------- Template/wiki/editions.php | 75 +++++++++++++++--------------- Template/wiki/sidebar.php | 69 ++++++++++++++++++++-------- 4 files changed, 120 insertions(+), 131 deletions(-) diff --git a/Controller/WikiController.php b/Controller/WikiController.php index c04474c..14e6d34 100755 --- a/Controller/WikiController.php +++ b/Controller/WikiController.php @@ -99,16 +99,29 @@ public function editions() $project = $this->getProject(); $wiki_id = $this->request->getIntegerParam('wiki_id'); - // $project = $this->getProject(); - // - // for list use window-restore + $wikipages = $this->wikiModel->getWikipages($project['id']); + $wikiPagesResult = array(); + foreach ($wikipages as $page) { + if (t($wiki_id) == t($page['id'])) { + $wikipage = $page; + } + if(!isset($page['parent_id'])){ + $page['children'] = $this->getNestedChildren($page['id'], $wikipages); + array_push($wikiPagesResult, $page); + } + } - // restore button use undo + // If the last wikipage was deleted, select the new last wikipage. + if (!isset($wikipage)) { + $wikipage = end($wikipages); + } $this->response->html($this->helper->layout->app('wiki:wiki/editions', array( 'project' => $project, 'title' => $project['name'], 'wiki_id'=> $wiki_id, + 'wikipage' => $wikipage, + 'wikipages' => $wikiPagesResult, 'editions' => $this->wikiModel->getEditions($wiki_id), ))); diff --git a/Template/wiki/detail.php b/Template/wiki/detail.php index 8286ae6..7b992ba 100755 --- a/Template/wiki/detail.php +++ b/Template/wiki/detail.php @@ -1,79 +1,21 @@ - + - wikiHelper->js("plugins/Wiki/Asset/vendor/jquery-sortable/jquery-sortable.js")?> - wikiHelper->js("plugins/Wiki/Asset/Javascript/wiki.js")?> projectHeader->render($project, 'TaskListController', 'show') ?> -
-

- - url->link(t('Wiki overview'), 'WikiController', 'show', array('plugin' => 'wiki', 'project_id' => $project['id'])) ?> - - url->link(t('Wiki overview'), 'WikiController', 'readonly', array('plugin' => 'wiki', 'token' => $project['token'])) ?> - -

-
- - -
-
- -
    data-reorder-url="url->href('WikiAjaxController', 'reorder_by_index', array('plugin' => 'wiki', 'project_id' => $project['id'], 'csrf_token' => $this->app->getToken()->getReusableCSRFToken())) ?>"> - - -
  • - - url->link(t($page['title']), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $page['id']))?> - modal->confirm('trash-o', t(''), 'WikiController', 'confirm', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $page['id']))?> - - url->link(t($page['title']), 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $page['id']))?> - - 0): ?> - wikiHelper->renderChildren($page['children'], $page['id'], $project, $not_editable)?> - -
    • +
    +render('wiki:wiki/sidebar', array( + 'project' => $project, + 'wiki_id' => $wiki_id, + 'wikipages' => $wikipages, + 'not_editable' => $not_editable, +)) ?> - -
- -
    -
  • - -
    • -
- - -
    -
  • - modal->medium('plus', t('New Wiki page'), 'WikiController', 'create', array('plugin' => 'wiki', 'project_id' => $project['id']))?> -
    • -
- - - -
- -
+

@@ -87,7 +29,7 @@
- modal->large('edit', t('Edit page'), 'WikiController', 'edit', array('plugin' => 'wiki', 'wiki_id' => $wikipage['id']))?> + modal->medium('edit', t('Edit page'), 'WikiController', 'edit', array('plugin' => 'wiki', 'wiki_id' => $wikipage['id']))?>
url->icon('window-restore', t('View Editions'), 'WikiController', 'editions', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wikipage['id']))?> @@ -139,3 +81,7 @@
+ + + + diff --git a/Template/wiki/editions.php b/Template/wiki/editions.php index a7bfa84..d98b227 100755 --- a/Template/wiki/editions.php +++ b/Template/wiki/editions.php @@ -1,57 +1,53 @@ -
-

-
- - url->icon('long-arrow-alt-left', t('Back to details'), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wiki_id))?> + + + projectHeader->render($project, 'TaskListController', 'show') ?> + -
+
- -
+
+
+

+ url->icon('long-arrow-left', t('Back to details'), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wiki_id))?> +

+

:

+
-
+
-

+

modal->confirm('undo', t(''), 'WikiController', 'confirm_restore', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wiki_id, 'edition' => $edition['edition']))?> -
+

+

-

- -
-
+ dt->date($edition['date_creation'])?>
-

+

+
+ +
+ text->markdown($edition['content'])?> +
+
+

-
- text->markdown($edition['content'])?> -
- - - +
+ diff --git a/Template/wiki/sidebar.php b/Template/wiki/sidebar.php index bbb179d..2d72b93 100755 --- a/Template/wiki/sidebar.php +++ b/Template/wiki/sidebar.php @@ -1,25 +1,56 @@ - + +
-
    -
  • app->checkMenuSelection('WikiController', 'show') ?>> - url->link(t('Wiki overview'), 'WikiController', 'show', array('plugin' => 'wiki', 'project_id' => $project['id'])) ?> -
    • - - - - -
  • - + + wikiHelper->js("plugins/Wiki/Asset/vendor/jquery-sortable/jquery-sortable.js")?> + wikiHelper->js("plugins/Wiki/Asset/Javascript/wiki.js")?> + + + + url->icon('book', t('Wiki overview'), 'WikiController', 'show', array('plugin' => 'wiki', 'project_id' => $project['id'])) ?> +
    + modal->medium('plus', t('New Wiki page'), 'WikiController', 'create', array('plugin' => 'wiki', 'project_id' => $project['id']))?> + + url->icon('book', t('Wiki overview'), 'WikiController', 'readonly', array('plugin' => 'wiki', 'token' => $project['token'])) ?> + + +
    +
    +

    Wiki

    +
    + + +
      data-reorder-url="url->href('WikiAjaxController', 'reorder_by_index', array('plugin' => 'wiki', 'project_id' => $project['id'], 'csrf_token' => $this->app->getToken()->getReusableCSRFToken())) ?>"> + + +
    • + + url->link(t($page['title']), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $page['id']))?> + modal->confirm('trash-o', t(''), 'WikiController', 'confirm', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $page['id']))?> + + url->link(t($page['title']), 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $page['id']))?> + + 0): ?> + wikiHelper->renderChildren($page['children'], $page['id'], $project, $not_editable)?> +
      • + - - - - - - - +
    + +
      +
    • + +
      • +
    + -
+ From 6eb0fd9afad01952cc0cad03f5d011f22bc00f14 Mon Sep 17 00:00:00 2001 From: "Im[F(x)]" Date: Tue, 29 Oct 2024 13:15:58 +0200 Subject: [PATCH 11/50] * totally removing clearfix styles from css and from inline * adjusting styles for wiki content list items --- Asset/css/wiki.css | 61 +++++++++-------------- Template/wiki/show.php | 108 ++++++++++++++++------------------------- 2 files changed, 63 insertions(+), 106 deletions(-) diff --git a/Asset/css/wiki.css b/Asset/css/wiki.css index 2f521ce..e4762ac 100644 --- a/Asset/css/wiki.css +++ b/Asset/css/wiki.css @@ -8,7 +8,7 @@ user-select: none; } */ body.dragging, body.dragging * { -cursor: move !important; + cursor: move !important; } .dragged { @@ -18,51 +18,34 @@ cursor: move !important; } #columns { -list-style-type: none; + list-style-type: none; } .wikipage { -width: 162px; -padding-bottom: 5px; -padding-top: 5px; -text-align: left; -/* cursor: move; */ + padding-bottom: 5px; + padding-top: 5px; + text-align: left; } .wikipage header { -height: 20px; -width: 150px; -color: black; -background-color: #ccc; -padding: 5px; -border-bottom: 1px solid #ddd; -border-radius: 10px; -border: 2px solid #666666; + height: 20px; + width: 150px; + color: black; + background-color: #ccc; + padding: 5px; + border-bottom: 1px solid #ddd; + border-radius: 10px; + border: 2px solid #666666; } - -.wikipage.dragElem { -opacity: 0.4; +.wikipage li { + line-height: normal !important; } -.wikipage.over { -border: 2px dashed #000; -border-top: 2px solid blue; -} - -.clearfix::after { -content: ""; -clear: both; -display: table; +.wikipage li:last-child { + margin-bottom: 0px !important; } -.column { -float: left; -min-width: 0; -} -.list { -width: 25%; +.wikipage.dragElem { + opacity: 0.4; } -.content { -width: 75%; +.wikipage.over { + border: 2px dashed #000; + border-top: 2px solid blue; } - -.sidebar>ul li:last-child { - margin-bottom: 0px; -} \ No newline at end of file diff --git a/Template/wiki/show.php b/Template/wiki/show.php index c352973..52f6e21 100755 --- a/Template/wiki/show.php +++ b/Template/wiki/show.php @@ -16,30 +16,8 @@
- -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- - url->link(t($wikipage['title']), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wikipage['id']))?> - modal->confirm('trash-o', t(''), 'WikiController', 'confirm', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wikipage['id']))?> - - url->link(t($wikipage['title']), 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $wikipage['id']))?> - - - - - - url->link($wikipage['parent_id'], 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wikipage['parent_id']))?> - - url->link($wikipage['parent_id'], 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $wikipage['parent_id']))?> - - text->e($wikipage['creator_name'] ?: $wikipage['creator_username'])?>dt->date($wikipage['date_creation'])?>text->e($wikipage['modifier_name'] ?: $wikipage['modifier_username'])?>dt->date($wikipage['date_modification'])?>
-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + url->link(t($wikipage['title']), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wikipage['id']))?> + modal->confirm('trash-o', t(''), 'WikiController', 'confirm', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wikipage['id']))?> + + url->link(t($wikipage['title']), 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $wikipage['id']))?> + + + + + + url->link($wikipage['parent_id'], 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wikipage['parent_id']))?> + + url->link($wikipage['parent_id'], 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $wikipage['parent_id']))?> + + text->e($wikipage['creator_name'] ?: $wikipage['creator_username'])?>dt->date($wikipage['date_creation'])?>text->e($wikipage['modifier_name'] ?: $wikipage['modifier_username'])?>dt->date($wikipage['date_modification'])?>

-
- - From 757cdc8cc6ba0edaa6d855c343875d08d764d18b Mon Sep 17 00:00:00 2001 From: "Im[F(x)]" Date: Tue, 29 Oct 2024 14:21:00 +0200 Subject: [PATCH 12/50] * fixed some sane routes for 'WikiController' and 'WikiFileViewController' using a minimalistic notation corresponding to actions and parameters * removed the totally unnecessary 'wikipage_id' and 'project_id' parameters for file controller URLs --- Controller/WikiFileController.php | 4 +-- Plugin.php | 45 +++++++++++++------------------ Template/file_viewer/show.php | 2 +- Template/wiki_file/files.php | 6 ++--- Template/wiki_file/images.php | 8 +++--- 5 files changed, 28 insertions(+), 37 deletions(-) diff --git a/Controller/WikiFileController.php b/Controller/WikiFileController.php index 71d1e43..d932f65 100644 --- a/Controller/WikiFileController.php +++ b/Controller/WikiFileController.php @@ -23,7 +23,7 @@ public function screenshot() if ($this->request->isPost() && $this->wikiFileModel->uploadScreenshot($wiki['id'], $this->request->getValue('screenshot')) !== false) { $this->flash->success(t('Screenshot uploaded successfully.')); - return $this->response->redirect($this->helper->url->to('WikiViewController', 'show', array('wiki_id' => $wiki['id'], 'project_id' => $wiki['project_id'])), true); + return $this->response->redirect($this->helper->url->to('WikiController', 'show', array('wiki_id' => $wiki['id'], 'project_id' => $wiki['project_id'])), true); } return $this->response->html($this->template->render('wiki:wiki_file/screenshot', array( @@ -82,7 +82,7 @@ public function save() $this->response->redirect($this->helper->url->to('WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $wiki['project_id'], 'wiki_id' => $wiki['id'])), true); - // $this->response->redirect($this->helper->url->to('WikiViewController', 'show', array('wiki_id' => $wiki['id'], 'project_id' => $wiki['project_id'])), true); + // $this->response->redirect($this->helper->url->to('WikiController', 'show', array('wiki_id' => $wiki['id'], 'project_id' => $wiki['project_id'])), true); } } diff --git a/Plugin.php b/Plugin.php index f7e6c7a..fffabb6 100755 --- a/Plugin.php +++ b/Plugin.php @@ -10,47 +10,39 @@ class Plugin extends Base { public function initialize() { + // access map $this->projectAccessMap->add('WikiController', '*', Role::PROJECT_MEMBER); $this->projectAccessMap->add('WikiAjaxController', '*', Role::PROJECT_MEMBER); - $this->applicationAccessMap->add('WikiController', array('readonly','detail_readonly'), Role::APP_PUBLIC); $this->projectAccessMap->add('WikiFileController', '*', Role::PROJECT_MEMBER); $this->projectAccessMap->add('WikiFileViewController', '*', Role::PROJECT_MEMBER); + $this->applicationAccessMap->add('WikiController', array('readonly','detail_readonly'), Role::APP_PUBLIC); - // $this->route->addRoute('/wiki/project/:project_id', 'WikiController', 'readonly', 'wiki'); - // dont think these are even currently used + // page routes $this->route->addRoute('/wiki/project/:project_id', 'WikiController', 'show', 'wiki'); - $this->route->addRoute('/wiki/project/:project_id', 'WikiController', 'detail', 'wiki'); - $this->route->addRoute('/wiki/project/:project_id', 'WikiController', 'editions', 'wiki'); - $this->route->addRoute('/wiki/project/:project_id', 'WikiController', 'edit', 'wiki'); - - // show images as list - $this->route->addRoute('/wiki/project/:project_id', 'WikiFileController', 'show', 'wiki_file'); - $this->route->addRoute('/wiki/project/:project_id', 'WikiFileController', 'create', 'wiki_file'); - $this->route->addRoute('/wiki/project/:project_id', 'WikiFileController', 'remove', 'wiki_file'); - $this->route->addRoute('/wiki/project/:project_id', 'WikiFileController', 'images', 'wiki_file'); - $this->route->addRoute('/wiki/project/:project_id', 'WikiFileController', 'files', 'wiki_file'); - - - + $this->route->addRoute('/wiki/project/:project_id/readonly', 'WikiController', 'readonly', 'wiki'); + $this->route->addRoute('/wiki/project/:project_id/detail/:wiki_id', 'WikiController', 'detail', 'wiki'); + $this->route->addRoute('/wiki/project/:project_id/detail/:wiki_id/readonly', 'WikiController', 'detail_readonly', 'wiki'); + $this->route->addRoute('/wiki/project/:project_id/editions/:wiki_id', 'WikiController', 'editions', 'wiki'); + // $this->route->addRoute('/wiki/project/:project_id/breakdown', 'WikiController', 'breakdown', 'wiki'); + $this->route->addRoute('/wiki/file/:file_id', 'WikiFileViewController', 'show', 'wiki'); + $this->route->addRoute('/wiki/file/:file_id/image', 'WikiFileViewController', 'image', 'wiki'); + $this->route->addRoute('/wiki/file/:file_id/thumbnail', 'WikiFileViewController', 'thumbnail', 'wiki'); + $this->route->addRoute('/wiki/file/:file_id/browser', 'WikiFileViewController', 'browser', 'wiki'); + $this->route->addRoute('/wiki/file/:file_id/download', 'WikiFileViewController', 'download', 'wiki'); + + // template hooks $this->template->hook->attach('template:config:sidebar', 'Wiki:config/sidebar'); - - // $this->route->addRoute('/wiki/project/:project_id&:wikipage_id', 'WikiController', 'detail', 'wiki'); - $this->route->addRoute('/wiki/project/:project_id/breakdown', 'WikiController', 'breakdown', 'wiki'); - $this->template->hook->attach('template:project:dropdown', 'wiki:project/dropdown'); - $this->template->hook->attach('template:project-list:menu:after', 'wiki:wiki_list/menu'); - $this->template->hook->attach('template:header:dropdown', 'wiki:header/dropdown'); $this->template->hook->attach('template:project-header:view-switcher', 'Wiki:project_header/views'); + // template overrides $this->template->setTemplateOverride('board/view_public', 'wiki:board/view_public'); - $this->template->setTemplateOverride('file_viewer/show', 'wiki:file_viewer/show'); + // CSS + JS $this->hook->on('template:layout:css', array('template' => 'plugins/Wiki/Asset/css/wiki.css')); - // $this->hook->on('template:layout:js', array('template' => 'plugins/Wiki/Asset/vendor/jquery-sortable/jquery-sortable.js')); - // $this->hook->on('template:layout:js', array('template' => 'plugins/Wiki/Asset/Javascript/wiki.js')); $this->hook->on('template:layout:js', array('template' => 'plugins/Wiki/Asset/Javascript/main.js')); @@ -59,9 +51,8 @@ public function initialize() // $this->layout->register('wiki', '\Kanboard\Plugin\Wiki\Helper\layout'); // $this->helper->register('wiki', '\Kanboard\Plugin\Wiki\Helper\layout'); + // helpers $this->helper->register('wikiHelper', '\Kanboard\Plugin\Wiki\Helper\WikiHelper'); - - } public function onStartup() diff --git a/Template/file_viewer/show.php b/Template/file_viewer/show.php index b0e12e8..ac5add6 100644 --- a/Template/file_viewer/show.php +++ b/Template/file_viewer/show.php @@ -3,7 +3,7 @@
- <?= $this->text->e($file['name']) ?> + <?= $this->text->e($file['name']) ?>
text->markdown($content) ?> diff --git a/Template/wiki_file/files.php b/Template/wiki_file/files.php index beda880..8656cae 100644 --- a/Template/wiki_file/files.php +++ b/Template/wiki_file/files.php @@ -15,16 +15,16 @@
    file->getPreviewType($file['name']) !== null): ?>
  • - modal->large('eye', t('View file'), 'WikiFileViewController', 'show', array('plugin' => 'wiki', 'wikipage_id' => $wiki['id'], 'project_id' => $wiki['project_id'], 'file_id' => $file['id'])) ?> + modal->large('eye', t('View file'), 'WikiFileViewController', 'show', array('plugin' => 'wiki', 'file_id' => $file['id'])) ?>
    • file->getBrowserViewType($file['name']) !== null): ?>
  • - url->link(t('View file'), 'WikiFileViewController', 'browser', array('plugin' => 'wiki', 'wikipage_id' => $wiki['id'], 'project_id' => $wiki['project_id'], 'file_id' => $file['id']), false, '', '', true) ?> + url->link(t('View file'), 'WikiFileViewController', 'browser', array('plugin' => 'wiki', 'file_id' => $file['id']), false, '', '', true) ?>
  • - url->icon('download', t('Download'), 'WikiFileViewController', 'download', array('plugin' => 'wiki', 'wikipage_id' => $wiki['id'], 'project_id' => $wiki['project_id'], 'file_id' => $file['id'])) ?> + url->icon('download', t('Download'), 'WikiFileViewController', 'download', array('plugin' => 'wiki', 'file_id' => $file['id'])) ?>
    • user->hasProjectAccess('WikiFileController', 'remove', $wiki['project_id'])): ?>
  • diff --git a/Template/wiki_file/images.php b/Template/wiki_file/images.php index d9ff10c..b91d623 100644 --- a/Template/wiki_file/images.php +++ b/Template/wiki_file/images.php @@ -8,9 +8,9 @@ 'regex_file_id' => 'FILE_ID', 'regex_etag' => 'ETAG', 'url' => array( - 'image' => $this->url->to('WikiFileViewController', 'image', array('plugin' => 'wiki', 'file_id' => 'FILE_ID', 'project_id' => $wiki['project_id'], 'wikipage_id' => $wiki['id'])), - 'thumbnail' => $this->url->to('WikiFileViewController', 'thumbnail', array('plugin' => 'wiki', 'file_id' => 'FILE_ID', 'project_id' => $wiki['project_id'], 'wikipage_id' => $wiki['id'])), - 'download' => $this->url->to('WikiFileViewController', 'download', array('plugin' => 'wiki', 'file_id' => 'FILE_ID', 'project_id' => $wiki['project_id'], 'wikipage_id' => $wiki['id'])), + 'image' => $this->url->to('WikiFileViewController', 'image', array('plugin' => 'wiki', 'file_id' => 'FILE_ID')), + 'thumbnail' => $this->url->to('WikiFileViewController', 'thumbnail', array('plugin' => 'wiki', 'file_id' => 'FILE_ID')), + 'download' => $this->url->to('WikiFileViewController', 'download', array('plugin' => 'wiki', 'file_id' => 'FILE_ID')), ) )) ?> @@ -20,7 +20,7 @@ text->e($file['name']) ?>
    • - url->icon('download', t('Download'), 'WikiFileViewController', 'download', array('plugin' => 'wiki', 'wikipage_id' => $wiki['id'], 'project_id' => $wiki['project_id'], 'file_id' => $file['id'], 'file_id' => $file['id'])) ?> + url->icon('download', t('Download'), 'WikiFileViewController', 'download', array('plugin' => 'wiki', 'file_id' => $file['id'], 'file_id' => $file['id'])) ?>
      • user->hasProjectAccess('WikiFileController', 'remove', $wiki['project_id'])): ?>
    • From cde08dd32f22a67ef8110ec1490c27df8dcfc515 Mon Sep 17 00:00:00 2001 From: "Im[F(x)]" Date: Tue, 29 Oct 2024 15:34:16 +0200 Subject: [PATCH 13/50] * making the content of wiki pages expandable on demand (instead of fully preloaded) for the 'editions' and 'wiki listing' pages that show multiple rows with versions/pages at once * making sure the sidebar layout for detail/editions takes the whole screen width --- Controller/WikiController.php | 2 +- Template/wiki/editions.php | 14 ++++++-------- Template/wiki/sidebar.php | 3 +++ Template/wiki_list/wiki_details.php | 8 ++++++-- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Controller/WikiController.php b/Controller/WikiController.php index 14e6d34..ef5eeb3 100755 --- a/Controller/WikiController.php +++ b/Controller/WikiController.php @@ -254,7 +254,7 @@ public function detail() // $wikipage= $wikipages->eq('id', $wiki_id); - // $this->response->html($this->helper->layout->project('wiki:wiki/detail', array( + // $this->response->html($this->helper->layout->app('wiki:wiki/detail', array( // 'project' => $project, // 'title' => $project['name'], // 'wiki_id' => $wiki_id, diff --git a/Template/wiki/editions.php b/Template/wiki/editions.php index d98b227..90a3d7f 100755 --- a/Template/wiki/editions.php +++ b/Template/wiki/editions.php @@ -38,14 +38,12 @@ dt->date($edition['date_creation'])?>
-

-
- -
- text->markdown($edition['content'])?> -
-
-

+
+

+
+ text->markdown($edition['content'])?> +
+
diff --git a/Template/wiki/sidebar.php b/Template/wiki/sidebar.php index 2d72b93..bd3d2bb 100755 --- a/Template/wiki/sidebar.php +++ b/Template/wiki/sidebar.php @@ -4,6 +4,9 @@ resize: horizontal; overflow: auto; } +.sidebar-container { + width: 100%; +}
diff --git a/Template/wiki_list/wiki_details.php b/Template/wiki_list/wiki_details.php index e0a6a73..264c74c 100644 --- a/Template/wiki_list/wiki_details.php +++ b/Template/wiki_list/wiki_details.php @@ -17,8 +17,12 @@
  • -

    :

    - text->markdown($wiki['content'])?> +
    +

    +
    + text->markdown($wiki['content'])?> +
    +
    • From 849fd5f30b4f55e46c19c8b6edfd377d6cf490d8 Mon Sep 17 00:00:00 2001 From: "Im[F(x)]" Date: Tue, 29 Oct 2024 16:38:39 +0200 Subject: [PATCH 14/50] * redirecting the project wiki links in dropdown and header to the default detail page (wiki_id=0) that will show the first root wiki page * extracted preparing the wiki pages tree in a separate method as it gets reused in several places --- Controller/WikiController.php | 120 ++++++++++++++---------------- Template/project/dropdown.php | 2 +- Template/project_header/views.php | 2 +- 3 files changed, 56 insertions(+), 68 deletions(-) diff --git a/Controller/WikiController.php b/Controller/WikiController.php index ef5eeb3..80ebeea 100755 --- a/Controller/WikiController.php +++ b/Controller/WikiController.php @@ -95,33 +95,18 @@ public function show() public function editions() { - $project = $this->getProject(); $wiki_id = $this->request->getIntegerParam('wiki_id'); $wikipages = $this->wikiModel->getWikipages($project['id']); - $wikiPagesResult = array(); - foreach ($wikipages as $page) { - if (t($wiki_id) == t($page['id'])) { - $wikipage = $page; - } - if(!isset($page['parent_id'])){ - $page['children'] = $this->getNestedChildren($page['id'], $wikipages); - array_push($wikiPagesResult, $page); - } - } - - // If the last wikipage was deleted, select the new last wikipage. - if (!isset($wikipage)) { - $wikipage = end($wikipages); - } + $result =$this->prepareWikipagesTree($wikipages, $wiki_id); $this->response->html($this->helper->layout->app('wiki:wiki/editions', array( 'project' => $project, 'title' => $project['name'], 'wiki_id'=> $wiki_id, - 'wikipage' => $wikipage, - 'wikipages' => $wikiPagesResult, + 'wikipage' => $result['selected'], + 'wikipages' => $result['tree'], 'editions' => $this->wikiModel->getEditions($wiki_id), ))); @@ -170,48 +155,22 @@ public function detail_readonly() { $wiki_id = $this->request->getIntegerParam('wiki_id'); $wikipages = $this->wikiModel->getWikipages($project['id']); - - foreach ($wikipages as $page) { - if (t($wiki_id) == t($page['id'])) { - $wikipage = $page; - break; - } - } - - // If the last wikipage was deleted, select the new last wikipage. - if (!isset($wikipage)) { - $wikipage = end($wikipages); - } + $result =$this->prepareWikipagesTree($wikipages, $wiki_id); // use a wiki helper for better side bar TODO: $this->response->html($this->helper->layout->app('wiki:wiki/detail', array( 'project' => $project, 'title' => $project['name'], 'wiki_id' => $wiki_id, - 'wiki' => $wikipage, + 'wiki' => $result['selected'], 'not_editable' => true, 'files' => $this->wikiFileModel->getAllDocuments($wiki_id), 'images' => $this->wikiFileModel->getAllImages($wiki_id), - // 'wikipage' => $this->wikiModel->getWikipage($wiki_id), - 'wikipage' => $wikipage, - 'wikipages' => $wikipages, + 'wikipage' => $result['selected'], + 'wikipages' => $result['tree'], ))); } - function getNestedChildren($parent_id, $items) { - $children = []; - - foreach ($items as $item) { - if ($item['parent_id'] === $parent_id) { - $item['children'] = $this->getNestedChildren($item['id'], $items); - array_push($children, $item); - } - } - - return $children; - } - - /** * details for single wiki page */ @@ -222,32 +181,18 @@ public function detail() $wiki_id = $this->request->getIntegerParam('wiki_id'); $wikipages = $this->wikiModel->getWikipages($project['id']); - $wikiPagesResult = array(); - foreach ($wikipages as $page) { - if (t($wiki_id) == t($page['id'])) { - $wikipage = $page; - } - if(!isset($page['parent_id'])){ - $page['children'] = $this->getNestedChildren($page['id'], $wikipages); - array_push($wikiPagesResult, $page); - } - } - - // If the last wikipage was deleted, select the new last wikipage. - if (!isset($wikipage)) { - $wikipage = end($wikipages); - } + $result =$this->prepareWikipagesTree($wikipages, $wiki_id); // use a wiki helper for better side bar TODO: $this->response->html($this->helper->layout->app('wiki:wiki/detail', array( 'project' => $project, 'title' => $project['name'], 'wiki_id' => $wiki_id, - 'wiki' => $wikipage, + 'wiki' => $result['selected'], 'files' => $this->wikiFileModel->getAllDocuments($wiki_id), 'images' => $this->wikiFileModel->getAllImages($wiki_id), - 'wikipage' => $wikipage, - 'wikipages' => $wikiPagesResult, + 'wikipage' => $result['selected'], + 'wikipages' => $result['tree'], ))); // $wikipage= $wikipages->select(1)->eq('id', $wiki_id)->findOne(); @@ -287,6 +232,49 @@ public function detail() // ))); // } + private function getNestedChildren($parent_id, $items) { + $children = []; + + foreach ($items as $item) { + if ($item['parent_id'] === $parent_id) { + $item['children'] = $this->getNestedChildren($item['id'], $items); + array_push($children, $item); + } + } + + return $children; + } + + private function prepareWikipagesTree($wikipages, $wiki_id) { + $treeWikipages = array(); + $defaultWikipage = null; + $selectedWikipage = null; + + foreach ($wikipages as $page) { + if (t($wiki_id) == t($page['id'])) { + $selectedWikipage = $page; + } + if(!isset($page['parent_id'])){ + $page['children'] = $this->getNestedChildren($page['id'], $wikipages); + array_push($treeWikipages, $page); + + // set the first root page as default + if ($page['ordercolumn'] == 0) { + $defaultWikipage = $page; + } + } + } + + if (!isset($defaultWikipage)) { + $defaultWikipage = end($wikipages); + } + if (!isset($selectedWikipage)) { + $selectedWikipage = $defaultWikipage; + } + + return array('tree' => $treeWikipages, 'selected' => $selectedWikipage); + } + /** * Confirmation dialog before removing a wiki * diff --git a/Template/project/dropdown.php b/Template/project/dropdown.php index c5825ed..ec4ccf7 100755 --- a/Template/project/dropdown.php +++ b/Template/project/dropdown.php @@ -1,5 +1,5 @@ user->hasProjectAccess('WikiController', 'index', $project['id'])): ?>
  • - url->icon('book', t('Wiki'), 'WikiController', 'show', array('plugin' => 'wiki', 'project_id' => $project['id'])) ?> + url->icon('book', t('Wiki'), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => 0)) ?>
    • diff --git a/Template/project_header/views.php b/Template/project_header/views.php index 9ca1fcc..d13df60 100644 --- a/Template/project_header/views.php +++ b/Template/project_header/views.php @@ -1,3 +1,3 @@
  • app->checkMenuSelection('WikiController') ?>> - url->icon('book', t('Wiki'), 'WikiController', 'show', array('project_id' => $project['id'], 'search' => $filters['search'], 'plugin' => 'wiki'), false, 'view-wiki', t('Keyboard shortcut: "%s"', 'v w')) ?> + url->icon('book', t('Wiki'), 'WikiController', 'detail', array('project_id' => $project['id'], 'wiki_id' => 0, 'plugin' => 'wiki'), false, 'view-wiki', t('Keyboard shortcut: "%s"', 'v w')) ?>
    • From cf9eca532821f8d6bbfb71d567021c0d9de598e7 Mon Sep 17 00:00:00 2001 From: "Im[F(x)]" Date: Tue, 29 Oct 2024 19:19:10 +0200 Subject: [PATCH 15/50] * hiding the unnecessary filter fields from project header for the wiki related pages * reworked title and header for the 'index' wiki page * removed the redundant menu template for the 'index' wiki page * added an explicit search button (e.g. for mobile) * fixed styles for full width --- Asset/Javascript/wiki.js | 12 +++++++++--- Controller/WikiController.php | 2 +- Locale/cs_CZ/translations.php | 2 +- Locale/da_DK/translations.php | 2 +- Locale/de_DE/translations.php | 2 +- Locale/de_DE_du/translations.php | 2 +- Locale/es_ES/translations.php | 2 +- Locale/fi_FI/translations.php | 2 +- Locale/fr_FR/translations.php | 2 +- Locale/hu_HU/translations.php | 2 +- Locale/ja_JP/translations.php | 2 +- Locale/nb_NO/translations.php | 2 +- Locale/nl_NL/translations.php | 2 +- Locale/pl_PL/translations.php | 2 +- Locale/pt_BR/translations.php | 2 +- Locale/pt_PT/translations.php | 2 +- Locale/ru_RU/translations.php | 2 +- Locale/sr_Latn_RS/translations.php | 2 +- Locale/sv_SE/translations.php | 2 +- Locale/th_TH/translations.php | 2 +- Locale/tr_TR/translations.php | 2 +- Locale/uk_UA/translations.php | 2 +- Locale/zh_CN/translations.php | 2 +- Plugin.php | 1 - Template/wiki/show.php | 9 +++++++++ Template/wiki/sidebar.php | 2 +- Template/wiki_list/header.php | 6 +----- Template/wiki_list/listing.php | 10 +++------- Template/wiki_list/menu.php | 3 --- 29 files changed, 45 insertions(+), 42 deletions(-) delete mode 100644 Template/wiki_list/menu.php diff --git a/Asset/Javascript/wiki.js b/Asset/Javascript/wiki.js index c27df43..6a94509 100644 --- a/Asset/Javascript/wiki.js +++ b/Asset/Javascript/wiki.js @@ -1,7 +1,13 @@ jQuery(document).ready(function () { - /* - page reorder and nesting support using jquery sorting plugin - */ + //-------------------------------------- + // hide the KB filters toolbar + //-------------------------------------- + $('.input-addon-field').hide(); + $('.input-addon-item').hide(); + + //-------------------------------------- + // page reorder and nesting support using jquery sorting plugin + //-------------------------------------- if($("#columns").data("reorder-url")){ jQuery('#columns').sortable({ nested: true, diff --git a/Controller/WikiController.php b/Controller/WikiController.php index 80ebeea..927e0e4 100755 --- a/Controller/WikiController.php +++ b/Controller/WikiController.php @@ -49,7 +49,7 @@ public function index() $this->response->html($this->helper->layout->app('wiki:wiki_list/listing', array( 'paginator' => $paginator, - 'title' => t('Wikis') . ' (' . $paginator->getTotal() . ')', + 'title' => t('Wiki pages'), 'values' => array('search' => $search), ))); } diff --git a/Locale/cs_CZ/translations.php b/Locale/cs_CZ/translations.php index 44596ae..4f4d523 100755 --- a/Locale/cs_CZ/translations.php +++ b/Locale/cs_CZ/translations.php @@ -45,7 +45,7 @@ // 'Content' => 'Contenido', // 'Date Created' => 'Fecha de creacion', // 'Date Modified' => 'Fecha modificada', - // '%d Wiki pages' => '%d Páginas Wiki', + // 'Wiki pages' => 'Páginas Wiki', // 'Search by content' => 'Buscar por contenido', // 'Wiki page Title' => 'Título de la página Wiki'', // 'There are no editions for this Wiki page saved to restore.' => '', diff --git a/Locale/da_DK/translations.php b/Locale/da_DK/translations.php index 010c28f..c7742c4 100755 --- a/Locale/da_DK/translations.php +++ b/Locale/da_DK/translations.php @@ -45,7 +45,7 @@ // 'Content' => 'Contenido', // 'Date Created' => 'Fecha de creacion', // 'Date Modified' => 'Fecha modificada', - // '%d Wiki pages' => '%d Páginas Wiki', + // 'Wiki pages' => 'Páginas Wiki', // 'Search by content' => 'Buscar por contenido', // 'Wiki page Title' => 'Título de la página Wiki', // 'There are no editions for this Wiki page saved to restore.' => '', diff --git a/Locale/de_DE/translations.php b/Locale/de_DE/translations.php index fdf5519..115c8b0 100755 --- a/Locale/de_DE/translations.php +++ b/Locale/de_DE/translations.php @@ -45,7 +45,7 @@ 'Content' => 'Inhalt', 'Date Created' => 'Erstellungsdatum', 'Date Modified' => 'Änderungsdatum', - '%d Wiki pages' => '%d Wiki-Seiten', + 'Wiki pages' => 'Wiki-Seiten', 'Search by content' => 'Suche nach Inhalt', 'Wiki page Title' => 'Wikiseiten-Titel', 'There are no editions for this Wiki page saved to restore.' => 'Es sind keine Bearbeitungen zur Wiederherstellung für diese Wiki-Seite gespeichert.', diff --git a/Locale/de_DE_du/translations.php b/Locale/de_DE_du/translations.php index 71d15bb..8c75939 100644 --- a/Locale/de_DE_du/translations.php +++ b/Locale/de_DE_du/translations.php @@ -45,7 +45,7 @@ 'Content' => 'Inhalt', 'Date Created' => 'Erstellungsdatum', 'Date Modified' => 'Änderungsdatum', - '%d Wiki pages' => '%d Wiki-Seiten', + 'Wiki pages' => 'Wiki-Seiten', 'Search by content' => 'Suche nach Inhalt', 'Wiki page Title' => 'Wikiseiten-Titel', 'There are no editions for this Wiki page saved to restore.' => 'Es sind keine Bearbeitungen zur Wiederherstellung für diese Wiki-Seite gespeichert.', diff --git a/Locale/es_ES/translations.php b/Locale/es_ES/translations.php index d5be67c..d88aff5 100755 --- a/Locale/es_ES/translations.php +++ b/Locale/es_ES/translations.php @@ -45,7 +45,7 @@ 'Content' => 'Contenido', 'Date Created' => 'Fecha de creacion', 'Date Modified' => 'Fecha modificada', - '%d Wiki pages' => '%d Páginas Wiki', + 'Wiki pages' => 'Páginas Wiki', 'Search by content' => 'Buscar por contenido', 'Wiki page Title' => 'Título de la página Wiki', 'There are no editions for this Wiki page saved to restore.' => 'No hay ediciones guardadas para restaurar esta página Wiki.', diff --git a/Locale/fi_FI/translations.php b/Locale/fi_FI/translations.php index 88c54df..1a33480 100755 --- a/Locale/fi_FI/translations.php +++ b/Locale/fi_FI/translations.php @@ -44,7 +44,7 @@ // 'Content' => 'Contenido', // 'Date Created' => 'Fecha de creacion', // 'Date Modified' => 'Fecha modificada', - // '%d Wiki pages' => '%d Páginas Wiki', + // 'Wiki pages' => 'Páginas Wiki', // 'Search by content' => 'Buscar por contenido', // 'Wiki page Title' => 'Título de la página Wiki', // 'There are no editions for this Wiki page saved to restore.' => '', diff --git a/Locale/fr_FR/translations.php b/Locale/fr_FR/translations.php index 0f9bdf1..88f7822 100755 --- a/Locale/fr_FR/translations.php +++ b/Locale/fr_FR/translations.php @@ -47,7 +47,7 @@ 'Content' => 'Contenu', 'Date Created' => 'Date de création', 'Date Modified' => 'Date de modification', - '%d Wiki pages' => '%d Pages Wiki', + 'Wiki pages' => 'Pages Wiki', 'Search by content' => 'Chercher par contenu', 'Wiki page Title' => 'Titre de la page Wiki', 'There are no editions for this Wiki page saved to restore.' => 'Il n\'y a pas de versions sauvegardées de cette page wiki à restaurer.', diff --git a/Locale/hu_HU/translations.php b/Locale/hu_HU/translations.php index 1ac7860..c85d75c 100755 --- a/Locale/hu_HU/translations.php +++ b/Locale/hu_HU/translations.php @@ -45,7 +45,7 @@ // 'Content' => 'Contenido', // 'Date Created' => 'Fecha de creacion', // 'Date Modified' => 'Fecha modificada', - // '%d Wiki pages' => '%d Páginas Wiki', + // 'Wiki pages' => 'Páginas Wiki', // 'Search by content' => 'Buscar por contenido', // 'Wiki page Title' => 'Título de la página Wiki', // 'There are no editions for this Wiki page saved to restore.' => '', diff --git a/Locale/ja_JP/translations.php b/Locale/ja_JP/translations.php index 8ef899e..d95da4c 100755 --- a/Locale/ja_JP/translations.php +++ b/Locale/ja_JP/translations.php @@ -45,7 +45,7 @@ // 'Content' => 'Contenido', // 'Date Created' => 'Fecha de creacion', // 'Date Modified' => 'Fecha modificada', - // '%d Wiki pages' => '%d Páginas Wiki', + // 'Wiki pages' => 'Páginas Wiki', // 'Search by content' => 'Buscar por contenido', // 'Wiki page Title' => 'Título de la página Wiki', // 'There are no editions for this Wiki page saved to restore.' => '', diff --git a/Locale/nb_NO/translations.php b/Locale/nb_NO/translations.php index 5ba2f7d..45df6b0 100755 --- a/Locale/nb_NO/translations.php +++ b/Locale/nb_NO/translations.php @@ -45,7 +45,7 @@ // 'Content' => 'Contenido', // 'Date Created' => 'Fecha de creacion', // 'Date Modified' => 'Fecha modificada', - // '%d Wiki pages' => '%d Páginas Wiki', + // 'Wiki pages' => 'Páginas Wiki', // 'Search by content' => 'Buscar por contenido', // 'Wiki page Title' => 'Título de la página Wiki', // 'There are no editions for this Wiki page saved to restore.' => '', diff --git a/Locale/nl_NL/translations.php b/Locale/nl_NL/translations.php index 0074494..f1a0de8 100755 --- a/Locale/nl_NL/translations.php +++ b/Locale/nl_NL/translations.php @@ -45,7 +45,7 @@ // 'Content' => 'Contenido', // 'Date Created' => 'Fecha de creacion', // 'Date Modified' => 'Fecha modificada', - // '%d Wiki pages' => '%d Páginas Wiki', + // 'Wiki pages' => 'Páginas Wiki', // 'Search by content' => 'Buscar por contenido', // 'Wiki page Title' => 'Título de la página Wiki', // 'There are no editions for this Wiki page saved to restore.' => '', diff --git a/Locale/pl_PL/translations.php b/Locale/pl_PL/translations.php index f1783f3..9962291 100755 --- a/Locale/pl_PL/translations.php +++ b/Locale/pl_PL/translations.php @@ -45,7 +45,7 @@ // 'Content' => 'Contenido', // 'Date Created' => 'Fecha de creacion', // 'Date Modified' => 'Fecha modificada', - // '%d Wiki pages' => '%d Páginas Wiki', + // 'Wiki pages' => 'Páginas Wiki', // 'Search by content' => 'Buscar por contenido', // 'Wiki page Title' => 'Título de la página Wiki', // 'There are no editions for this Wiki page saved to restore.' => '', diff --git a/Locale/pt_BR/translations.php b/Locale/pt_BR/translations.php index c80fe4a..c320c07 100755 --- a/Locale/pt_BR/translations.php +++ b/Locale/pt_BR/translations.php @@ -43,7 +43,7 @@ 'Content' => 'Conteúdo', 'Date Created' => 'Data Criada', 'Date Modified' => 'Data modificada', - '%d Wiki pages' => '%d Páginas Wiki', + 'Wiki pages' => 'Páginas Wiki', 'Search by content' => 'Buscar por conteúdo', 'Wiki page Title' => 'Página do Wiki Título', 'There are no editions for this Wiki page saved to restore.' => 'Não há edições salvas para restaurar.', diff --git a/Locale/pt_PT/translations.php b/Locale/pt_PT/translations.php index e0dba60..7b4718b 100755 --- a/Locale/pt_PT/translations.php +++ b/Locale/pt_PT/translations.php @@ -46,7 +46,7 @@ 'Content' => 'Conteúdo', 'Date Created' => 'Data Criada', 'Date Modified' => 'Data modificada', - '%d Wiki pages' => '%d Páginas Wiki', + 'Wiki pages' => 'Páginas Wiki', 'Search by content' => 'Buscar por conteúdo', 'Wiki page Title' => 'Página do Wiki Título', 'There are no editions for this Wiki page saved to restore.' => 'Não há edições salvas para restaurar.', diff --git a/Locale/ru_RU/translations.php b/Locale/ru_RU/translations.php index 451a4d9..03102db 100755 --- a/Locale/ru_RU/translations.php +++ b/Locale/ru_RU/translations.php @@ -45,7 +45,7 @@ 'Content' => 'Контент', 'Date Created' => 'Дата создания', 'Date Modified' => 'Дата модификации', - '%d Wiki pages' => '%d Wiki страниц', + 'Wiki pages' => 'Wiki страниц', 'Search by content' => 'Поиск по содержимому', 'Wiki page Title' => 'Заголовок Wiki страницы', 'There are no editions for this Wiki page saved to restore.' => 'Нет сохраненных редакций этой Wiki страницы для восстановления.', diff --git a/Locale/sr_Latn_RS/translations.php b/Locale/sr_Latn_RS/translations.php index 0074494..f1a0de8 100755 --- a/Locale/sr_Latn_RS/translations.php +++ b/Locale/sr_Latn_RS/translations.php @@ -45,7 +45,7 @@ // 'Content' => 'Contenido', // 'Date Created' => 'Fecha de creacion', // 'Date Modified' => 'Fecha modificada', - // '%d Wiki pages' => '%d Páginas Wiki', + // 'Wiki pages' => 'Páginas Wiki', // 'Search by content' => 'Buscar por contenido', // 'Wiki page Title' => 'Título de la página Wiki', // 'There are no editions for this Wiki page saved to restore.' => '', diff --git a/Locale/sv_SE/translations.php b/Locale/sv_SE/translations.php index cc76dc1..49f6bdd 100755 --- a/Locale/sv_SE/translations.php +++ b/Locale/sv_SE/translations.php @@ -45,7 +45,7 @@ // 'Content' => 'Contenido', // 'Date Created' => 'Fecha de creacion', // 'Date Modified' => 'Fecha modificada', - // '%d Wiki pages' => '%d Páginas Wiki', + // 'Wiki pages' => 'Páginas Wiki', // 'Search by content' => 'Buscar por contenido', // 'Wiki page Title' => 'Título de la página Wiki', // 'There are no editions for this Wiki page saved to restore.' => '', diff --git a/Locale/th_TH/translations.php b/Locale/th_TH/translations.php index e54489b..086ce3e 100755 --- a/Locale/th_TH/translations.php +++ b/Locale/th_TH/translations.php @@ -45,7 +45,7 @@ // 'Content' => 'Contenido', // 'Date Created' => 'Fecha de creacion', // 'Date Modified' => 'Fecha modificada', - // '%d Wiki pages' => '%d Páginas Wiki', + // 'Wiki pages' => 'Páginas Wiki', // 'Search by content' => 'Buscar por contenido', // 'Wiki page Title' => 'Título de la página Wiki', // 'There are no editions for this Wiki page saved to restore.' => '', diff --git a/Locale/tr_TR/translations.php b/Locale/tr_TR/translations.php index 0074494..f1a0de8 100755 --- a/Locale/tr_TR/translations.php +++ b/Locale/tr_TR/translations.php @@ -45,7 +45,7 @@ // 'Content' => 'Contenido', // 'Date Created' => 'Fecha de creacion', // 'Date Modified' => 'Fecha modificada', - // '%d Wiki pages' => '%d Páginas Wiki', + // 'Wiki pages' => 'Páginas Wiki', // 'Search by content' => 'Buscar por contenido', // 'Wiki page Title' => 'Título de la página Wiki', // 'There are no editions for this Wiki page saved to restore.' => '', diff --git a/Locale/uk_UA/translations.php b/Locale/uk_UA/translations.php index 0734ac8..f4d30b6 100644 --- a/Locale/uk_UA/translations.php +++ b/Locale/uk_UA/translations.php @@ -45,7 +45,7 @@ 'Content' => 'Зміст', 'Date Created' => 'Дата створення', 'Date Modified' => 'Дата внесення змін', - '%d Wiki pages' => '%d Wiki сторінок', + 'Wiki pages' => 'Wiki сторінок', 'Search by content' => 'Пошук за вмістом', 'Wiki page Title' => 'Заголовок Wiki сторінки', 'There are no editions for this Wiki page saved to restore.' => 'Немає збережених редакцій цієї Wiki сторінки для відновлення.', diff --git a/Locale/zh_CN/translations.php b/Locale/zh_CN/translations.php index d4ee100..43509a0 100755 --- a/Locale/zh_CN/translations.php +++ b/Locale/zh_CN/translations.php @@ -45,7 +45,7 @@ // 'Content' => 'Contenido', // 'Date Created' => 'Fecha de creacion', // 'Date Modified' => 'Fecha modificada', - // '%d Wiki pages' => '%d Páginas Wiki', + // 'Wiki pages' => 'Páginas Wiki', // 'Search by content' => 'Buscar por contenido', // 'Wiki page Title' => 'Título de la página Wiki', // 'There are no editions for this Wiki page saved to restore.' => '', diff --git a/Plugin.php b/Plugin.php index fffabb6..22cc28f 100755 --- a/Plugin.php +++ b/Plugin.php @@ -33,7 +33,6 @@ public function initialize() // template hooks $this->template->hook->attach('template:config:sidebar', 'Wiki:config/sidebar'); $this->template->hook->attach('template:project:dropdown', 'wiki:project/dropdown'); - $this->template->hook->attach('template:project-list:menu:after', 'wiki:wiki_list/menu'); $this->template->hook->attach('template:header:dropdown', 'wiki:header/dropdown'); $this->template->hook->attach('template:project-header:view-switcher', 'Wiki:project_header/views'); diff --git a/Template/wiki/show.php b/Template/wiki/show.php index 52f6e21..d21c721 100755 --- a/Template/wiki/show.php +++ b/Template/wiki/show.php @@ -1,8 +1,17 @@ +wikiHelper->js("plugins/Wiki/Asset/Javascript/wiki.js")?> + projectHeader->render($project, 'TaskListController', 'show') ?> + + +

    diff --git a/Template/wiki/sidebar.php b/Template/wiki/sidebar.php index bd3d2bb..ffef6e6 100755 --- a/Template/wiki/sidebar.php +++ b/Template/wiki/sidebar.php @@ -5,7 +5,7 @@ overflow: auto; } .sidebar-container { - width: 100%; + clear: both; } diff --git a/Template/wiki_list/header.php b/Template/wiki_list/header.php index 962ddf8..16f5f25 100644 --- a/Template/wiki_list/header.php +++ b/Template/wiki_list/header.php @@ -1,10 +1,6 @@
    - getTotal() > 1): ?> - getTotal()) ?> - - getTotal()) ?> - +

    getTotal() ?>

    render('Wiki:wiki_list/sort_menu', array('paginator' => $paginator)) ?> diff --git a/Template/wiki_list/listing.php b/Template/wiki_list/listing.php index 67ba99c..cda2f7f 100644 --- a/Template/wiki_list/listing.php +++ b/Template/wiki_list/listing.php @@ -1,10 +1,4 @@ -
    -
      - hook->render('template:project-list:menu:before') ?> - - hook->render('template:project-list:menu:after') ?> -
    -
    +wikiHelper->js("plugins/Wiki/Asset/Javascript/wiki.js")?>
    @@ -12,6 +6,8 @@ form->hidden('action', array('action' => 'index')) ?> form->hidden('plugin', array('plugin' => 'Wiki')) ?> form->text('search', $values, array(), array('placeholder="'.t('Search by content').'"')) ?> +   +
    diff --git a/Template/wiki_list/menu.php b/Template/wiki_list/menu.php deleted file mode 100644 index 73fdbf9..0000000 --- a/Template/wiki_list/menu.php +++ /dev/null @@ -1,3 +0,0 @@ -user->hasAccess('WikiController', 'show')): ?> -
  • url->icon('book', t('Wiki overview'), 'WikiController', 'index', array('plugin' => 'Wiki')) ?>
    • - \ No newline at end of file From ef88f6da86a646cd58d64ead8258d5849b641cb1 Mon Sep 17 00:00:00 2001 From: "Im[F(x)]" Date: Tue, 29 Oct 2024 21:08:39 +0200 Subject: [PATCH 16/50] * added highlight for the selected page in the wiki content tree * changed the 'renderChildren' helper method and its references in unit tests --- Asset/css/wiki.css | 3 +++ Controller/WikiController.php | 6 +++--- Helper/WikiHelper.php | 7 ++++--- Template/wiki/sidebar.php | 4 ++-- Test/Helper/WikiHelperTest.php | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Asset/css/wiki.css b/Asset/css/wiki.css index e4762ac..aac81bf 100644 --- a/Asset/css/wiki.css +++ b/Asset/css/wiki.css @@ -42,6 +42,9 @@ body.dragging, body.dragging * { .wikipage li:last-child { margin-bottom: 0px !important; } +.wikipage.active { + box-shadow: 0 0 15px #777777 inset; +} .wikipage.dragElem { opacity: 0.4; } diff --git a/Controller/WikiController.php b/Controller/WikiController.php index 927e0e4..b8c3e9b 100755 --- a/Controller/WikiController.php +++ b/Controller/WikiController.php @@ -104,7 +104,7 @@ public function editions() $this->response->html($this->helper->layout->app('wiki:wiki/editions', array( 'project' => $project, 'title' => $project['name'], - 'wiki_id'=> $wiki_id, + 'wiki_id'=> $result['selected']['id'], 'wikipage' => $result['selected'], 'wikipages' => $result['tree'], 'editions' => $this->wikiModel->getEditions($wiki_id), @@ -161,7 +161,7 @@ public function detail_readonly() { $this->response->html($this->helper->layout->app('wiki:wiki/detail', array( 'project' => $project, 'title' => $project['name'], - 'wiki_id' => $wiki_id, + 'wiki_id' => $result['selected']['id'], 'wiki' => $result['selected'], 'not_editable' => true, 'files' => $this->wikiFileModel->getAllDocuments($wiki_id), @@ -187,7 +187,7 @@ public function detail() $this->response->html($this->helper->layout->app('wiki:wiki/detail', array( 'project' => $project, 'title' => $project['name'], - 'wiki_id' => $wiki_id, + 'wiki_id' => $result['selected']['id'], 'wiki' => $result['selected'], 'files' => $this->wikiFileModel->getAllDocuments($wiki_id), 'images' => $this->wikiFileModel->getAllImages($wiki_id), diff --git a/Helper/WikiHelper.php b/Helper/WikiHelper.php index 1a1b443..96f16c7 100644 --- a/Helper/WikiHelper.php +++ b/Helper/WikiHelper.php @@ -44,13 +44,14 @@ public function js($filepath, $async = false) * @param mixed $children * @param mixed $parent_id * @param mixed $project + * @param mixed $selected_wiki_id * @param mixed $not_editable * @return string */ - public function renderChildren($children, $parent_id, $project, $not_editable){ + public function renderChildren($children, $parent_id, $project, $selected_wiki_id, $not_editable){ $html = '
      '; foreach ($children as $item) { - $html .= '
    • '; + $html .= '
    • '; if(!$not_editable){ $html .= $this->helper->url->link( t($item['title']), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $item['id']) @@ -62,7 +63,7 @@ public function renderChildren($children, $parent_id, $project, $not_editable){ ); } if(count($item['children']) > 0){ - $html .= $this->renderChildren($item['children'], $item['id'], $project, $not_editable); + $html .= $this->renderChildren($item['children'], $item['id'], $project, $selected_wiki_id, $not_editable); } $html .= '
      • '; } diff --git a/Template/wiki/sidebar.php b/Template/wiki/sidebar.php index ffef6e6..9f06176 100755 --- a/Template/wiki/sidebar.php +++ b/Template/wiki/sidebar.php @@ -33,7 +33,7 @@
        data-reorder-url="url->href('WikiAjaxController', 'reorder_by_index', array('plugin' => 'wiki', 'project_id' => $project['id'], 'csrf_token' => $this->app->getToken()->getReusableCSRFToken())) ?>"> -
      • +
      • url->link(t($page['title']), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $page['id']))?> modal->confirm('trash-o', t(''), 'WikiController', 'confirm', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $page['id']))?> @@ -41,7 +41,7 @@ url->link(t($page['title']), 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $page['id']))?> 0): ?> - wikiHelper->renderChildren($page['children'], $page['id'], $project, $not_editable)?> + wikiHelper->renderChildren($page['children'], $page['id'], $project, $wiki_id, $not_editable)?>
        • diff --git a/Test/Helper/WikiHelperTest.php b/Test/Helper/WikiHelperTest.php index bdb3ee0..f15cafc 100644 --- a/Test/Helper/WikiHelperTest.php +++ b/Test/Helper/WikiHelperTest.php @@ -35,7 +35,7 @@ public function testRenderChildren(){ 'id'=> '1', ); - $htmlResult = $helper->renderChildren($children, 1, $project, false); + $htmlResult = $helper->renderChildren($children, 1, $project, 0, false); $this->assertStringContainsString('
          assertStringContainsString('
        • Date: Wed, 30 Oct 2024 00:35:53 +0200 Subject: [PATCH 17/50] * adjusting the highlight for the selected page in the wiki content tree - only highlight the name link * renamed the `columns` element to the more descriptive `wikitree` --- Asset/css/wiki.css | 37 +++++++++++++++++-------------------- Helper/WikiHelper.php | 8 +++++--- Template/wiki/editions.php | 2 +- Template/wiki/show.php | 2 +- Template/wiki/sidebar.php | 27 +++++++++++++++------------ 5 files changed, 39 insertions(+), 37 deletions(-) diff --git a/Asset/css/wiki.css b/Asset/css/wiki.css index aac81bf..e9ce6cc 100644 --- a/Asset/css/wiki.css +++ b/Asset/css/wiki.css @@ -17,34 +17,31 @@ body.dragging, body.dragging * { z-index: 2000; } -#columns { +#wikitree { list-style-type: none; } +#wikitree li { + line-height: normal !important; +} +#wikitree li:last-child { + margin-bottom: 0px !important; +} +#wikitree .wikilink.active { + box-shadow: 0 0 10px #777777 inset; +} + +.wikilink { + padding-top: 3px; + padding-bottom: 3px; + padding-left: 10px; + padding-right: 10px; +} .wikipage { padding-bottom: 5px; padding-top: 5px; text-align: left; } -.wikipage header { - height: 20px; - width: 150px; - color: black; - background-color: #ccc; - padding: 5px; - border-bottom: 1px solid #ddd; - border-radius: 10px; - border: 2px solid #666666; -} -.wikipage li { - line-height: normal !important; -} -.wikipage li:last-child { - margin-bottom: 0px !important; -} -.wikipage.active { - box-shadow: 0 0 15px #777777 inset; -} .wikipage.dragElem { opacity: 0.4; } diff --git a/Helper/WikiHelper.php b/Helper/WikiHelper.php index 96f16c7..16b4f2a 100644 --- a/Helper/WikiHelper.php +++ b/Helper/WikiHelper.php @@ -51,15 +51,17 @@ public function js($filepath, $async = false) public function renderChildren($children, $parent_id, $project, $selected_wiki_id, $not_editable){ $html = '
            '; foreach ($children as $item) { - $html .= '
          • '; + $is_active = ($selected_wiki_id == $item['id']) ? ' active' : ''; + $html .= '
          • '; if(!$not_editable){ $html .= $this->helper->url->link( - t($item['title']), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $item['id']) + t($item['title']), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $item['id']), false, 'wikilink'.$is_active ); $html .= $this->helper->modal->confirm('trash-o', t(''), 'WikiController', 'confirm', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $item['id'])); + $html .= $this->helper->modal->confirm('trash-o', '', 'WikiController', 'confirm', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $item['id'])); } else { $html .= $this->helper->url->link( - t($item['title']), 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $item['id']) + t($item['title']), 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $item['id']), false, 'wikilink'.$is_active ); } if(count($item['children']) > 0){ diff --git a/Template/wiki/editions.php b/Template/wiki/editions.php index 90a3d7f..a8c1012 100755 --- a/Template/wiki/editions.php +++ b/Template/wiki/editions.php @@ -30,7 +30,7 @@

            - modal->confirm('undo', t(''), 'WikiController', 'confirm_restore', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wiki_id, 'edition' => $edition['edition']))?> + modal->confirm('undo', '', 'WikiController', 'confirm_restore', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wiki_id, 'edition' => $edition['edition']))?>

            diff --git a/Template/wiki/show.php b/Template/wiki/show.php index d21c721..dfe4579 100755 --- a/Template/wiki/show.php +++ b/Template/wiki/show.php @@ -51,7 +51,7 @@ url->link(t($wikipage['title']), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wikipage['id']))?> - modal->confirm('trash-o', t(''), 'WikiController', 'confirm', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wikipage['id']))?> + modal->confirm('trash-o', '', 'WikiController', 'confirm', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wikipage['id']))?> url->link(t($wikipage['title']), 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $wikipage['id']))?> diff --git a/Template/wiki/sidebar.php b/Template/wiki/sidebar.php index 9f06176..a8b04a7 100755 --- a/Template/wiki/sidebar.php +++ b/Template/wiki/sidebar.php @@ -30,20 +30,23 @@

            -
              data-reorder-url="url->href('WikiAjaxController', 'reorder_by_index', array('plugin' => 'wiki', 'project_id' => $project['id'], 'csrf_token' => $this->app->getToken()->getReusableCSRFToken())) ?>"> +
                data-reorder-url="url->href('WikiAjaxController', 'reorder_by_index', array('plugin' => 'wiki', 'project_id' => $project['id'], 'csrf_token' => $this->app->getToken()->getReusableCSRFToken())) ?>"> -
              • - - url->link(t($page['title']), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $page['id']))?> - modal->confirm('trash-o', t(''), 'WikiController', 'confirm', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $page['id']))?> - - url->link(t($page['title']), 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $page['id']))?> - - 0): ?> - wikiHelper->renderChildren($page['children'], $page['id'], $project, $wiki_id, $not_editable)?> - -
                • + '; + if (!$not_editable) { + print $this->url->link(t($page['title']), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $page['id']), false, 'wikilink'.$is_active); + print $this->modal->confirm('trash-o', '', 'WikiController', 'confirm', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $page['id'])); + } else { + print $this->url->link(t($page['title']), 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $page['id']), false, 'wikilink'.$is_active); + } + if (count($page['children']) > 0) { + print $this->wikiHelper->renderChildren($page['children'], $page['id'], $project, $wiki_id, $not_editable); + } + print ''; + ?>
              From 804f754b582cd37767e1a5cdf447aa82b0e2e370 Mon Sep 17 00:00:00 2001 From: "Im[F(x)]" Date: Wed, 30 Oct 2024 01:25:50 +0200 Subject: [PATCH 18/50] * implemented collapse/expand buttons for the wikitree branches * removing duplicated code from wikitree sidebar in favor of reusing `renderChildren` helper --- Asset/Javascript/wiki.js | 26 +++++++++++++++++++++++--- Asset/css/wiki.css | 29 ++++++++++++++++++++--------- Helper/WikiHelper.php | 8 +++++++- Template/wiki/sidebar.php | 19 +------------------ 4 files changed, 51 insertions(+), 31 deletions(-) diff --git a/Asset/Javascript/wiki.js b/Asset/Javascript/wiki.js index 6a94509..02a23b3 100644 --- a/Asset/Javascript/wiki.js +++ b/Asset/Javascript/wiki.js @@ -5,11 +5,31 @@ jQuery(document).ready(function () { $('.input-addon-field').hide(); $('.input-addon-item').hide(); + //-------------------------------------- + // handle collapse/expand of wikitree branches + //-------------------------------------- + $('.branch').click(function() { + const button = $(this).find("a i")[0]; + const branch = $(this).parent().find("ul")[0]; + if ($(button).hasClass( 'fa fa-minus-square' )) { + $(button).removeClass( 'fa fa-minus-square' ); + $(button).addClass( 'fa fa-plus-square' ); + $(branch).hide(); + return; + } + if ($(button).hasClass( 'fa fa-plus-square' )) { + $(button).removeClass( 'fa fa-plus-square' ); + $(button).addClass( 'fa fa-minus-square' ); + $(branch).show(); + return; + } + }); + //-------------------------------------- // page reorder and nesting support using jquery sorting plugin //-------------------------------------- - if($("#columns").data("reorder-url")){ - jQuery('#columns').sortable({ + if($("#wikitree").data("reorder-url")){ + $('#wikitree').sortable({ nested: true, onDrop: function ($item, container, _super) { // console.log("onDrop", $item, container, _super) @@ -30,7 +50,7 @@ jQuery(document).ready(function () { $.ajax({ cache: false, - url: $("#columns").data("reorder-url"), + url: $("#wikitree").data("reorder-url"), contentType: "application/json", type: "POST", processData: false, diff --git a/Asset/css/wiki.css b/Asset/css/wiki.css index e9ce6cc..c63e1ed 100644 --- a/Asset/css/wiki.css +++ b/Asset/css/wiki.css @@ -1,12 +1,3 @@ -/* [draggable] { --moz-user-select: none; --khtml-user-select: none; --webkit-user-select: none; -user-select: none; --khtml-user-drag: element; --webkit-user-drag: element; -} */ - body.dragging, body.dragging * { cursor: move !important; } @@ -20,6 +11,26 @@ body.dragging, body.dragging * { #wikitree { list-style-type: none; } +#wikitree .ident { + appearance: none; + -webkit-appearance: none; + outline: none; + border: 0; + background: transparent; + padding-right: 3px; + padding-left: 3px; + cursor: default; +} +#wikitree .branch { + appearance: none; + -webkit-appearance: none; + outline: none; + border: 0; + background: transparent; + padding-right: 3px; + padding-left: 3px; + cursor: pointer; +} #wikitree li { line-height: normal !important; } diff --git a/Helper/WikiHelper.php b/Helper/WikiHelper.php index 16b4f2a..262d20e 100644 --- a/Helper/WikiHelper.php +++ b/Helper/WikiHelper.php @@ -53,11 +53,17 @@ public function renderChildren($children, $parent_id, $project, $selected_wiki_i foreach ($children as $item) { $is_active = ($selected_wiki_id == $item['id']) ? ' active' : ''; $html .= '
            • '; + if(count($item['children']) > 0){ + $html .= ''; + } else { + $html .= ''; + } + $html .= ''; if(!$not_editable){ $html .= $this->helper->url->link( t($item['title']), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $item['id']), false, 'wikilink'.$is_active ); - $html .= $this->helper->modal->confirm('trash-o', t(''), 'WikiController', 'confirm', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $item['id'])); + $html .= ''; $html .= $this->helper->modal->confirm('trash-o', '', 'WikiController', 'confirm', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $item['id'])); } else { $html .= $this->helper->url->link( diff --git a/Template/wiki/sidebar.php b/Template/wiki/sidebar.php index a8b04a7..109b3dc 100755 --- a/Template/wiki/sidebar.php +++ b/Template/wiki/sidebar.php @@ -31,24 +31,7 @@
                data-reorder-url="url->href('WikiAjaxController', 'reorder_by_index', array('plugin' => 'wiki', 'project_id' => $project['id'], 'csrf_token' => $this->app->getToken()->getReusableCSRFToken())) ?>"> - - - '; - if (!$not_editable) { - print $this->url->link(t($page['title']), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $page['id']), false, 'wikilink'.$is_active); - print $this->modal->confirm('trash-o', '', 'WikiController', 'confirm', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $page['id'])); - } else { - print $this->url->link(t($page['title']), 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $page['id']), false, 'wikilink'.$is_active); - } - if (count($page['children']) > 0) { - print $this->wikiHelper->renderChildren($page['children'], $page['id'], $project, $wiki_id, $not_editable); - } - print ''; - ?> - - +wikiHelper->renderChildren($wikipages, 0, $project, $wiki_id, $not_editable)?>
                From 6f901f860580a87356b4aac742f5b316aaca272f Mon Sep 17 00:00:00 2001 From: "Im[F(x)]" Date: Wed, 30 Oct 2024 02:36:12 +0200 Subject: [PATCH 19/50] * added in wiki content header collapseAll/expandAll/gotoSelected buttons for the wikitree branches * adjustments to branch fold/unfold buttons and icons, and edit/delete buttons aligned to right --- Asset/Javascript/wiki.js | 89 +++++++++++++++++++++++++++++++++------ Asset/css/wiki.css | 5 ++- Helper/WikiHelper.php | 24 +++++++---- Template/wiki/sidebar.php | 5 +++ 4 files changed, 99 insertions(+), 24 deletions(-) diff --git a/Asset/Javascript/wiki.js b/Asset/Javascript/wiki.js index 02a23b3..a701286 100644 --- a/Asset/Javascript/wiki.js +++ b/Asset/Javascript/wiki.js @@ -8,22 +8,83 @@ jQuery(document).ready(function () { //-------------------------------------- // handle collapse/expand of wikitree branches //-------------------------------------- - $('.branch').click(function() { - const button = $(this).find("a i")[0]; - const branch = $(this).parent().find("ul")[0]; - if ($(button).hasClass( 'fa fa-minus-square' )) { - $(button).removeClass( 'fa fa-minus-square' ); - $(button).addClass( 'fa fa-plus-square' ); - $(branch).hide(); - return; + if($("#wikitree").length == 1) { + function expandAllWikipagesBranches() { + const buttons = $("#wikitree").find(".branch"); + buttons.each(function () { + const button = $(this).find("a i")[0]; + const branch = $(this).parent().find("ul")[0]; + $(button).removeClass('fa-plus-square-o'); + $(button).addClass('fa-minus-square-o'); + $(branch).show(); + }); } - if ($(button).hasClass( 'fa fa-plus-square' )) { - $(button).removeClass( 'fa fa-plus-square' ); - $(button).addClass( 'fa fa-minus-square' ); - $(branch).show(); - return; + + function collapseAllWikipagesBranches() { + const buttons = $("#wikitree").find(".branch"); + buttons.each(function () { + const button = $(this).find("a i")[0]; + const branch = $(this).parent().find("ul")[0]; + $(button).removeClass('fa-minus-square-o'); + $(button).addClass('fa-plus-square-o'); + $(branch).hide(); + }); + } + + function gotoSelectedWikipageBranch() { + function expandParentWikipage(el) { + const parentUl = el.parent(); + const parentId = parentUl.attr("data-parent-id"); + if (parentId == 0) return; // end recursion + + const parentWikipage = parentUl.parent(); + const button = parentWikipage.find(".branch a i")[0]; + $(button).removeClass('fa-plus-square-o'); + $(button).addClass('fa-minus-square-o'); + parentUl.show(); + + expandParentWikipage(parentWikipage); + } + + const selected = $("#wikitree").find(".wikipage.active"); + expandParentWikipage(selected); } - }); + + $('.expandAll').click(function () { + expandAllWikipagesBranches(); + }); + + $('.collapseAll').click(function () { + collapseAllWikipagesBranches(); + }); + + $('.gotoSelected').click(function () { + gotoSelectedWikipageBranch(); + }); + + $('.branch').click(function () { + const button = $(this).find("a i")[0]; + const branch = $(this).parent().find("ul")[0]; + console.log(branch); + if ($(button).hasClass('fa-minus-square-o')) { + $(button).removeClass('fa-minus-square-o'); + $(button).addClass('fa-plus-square-o'); + $(branch).hide(); + console.log('hide') + return; + } + if ($(button).hasClass('fa-plus-square-o')) { + $(button).removeClass('fa-plus-square-o'); + $(button).addClass('fa-minus-square-o'); + $(branch).show(); + console.log('show') + return; + } + }); + + collapseAllWikipagesBranches(); + gotoSelectedWikipageBranch(); + } //-------------------------------------- // page reorder and nesting support using jquery sorting plugin diff --git a/Asset/css/wiki.css b/Asset/css/wiki.css index c63e1ed..340f1e4 100644 --- a/Asset/css/wiki.css +++ b/Asset/css/wiki.css @@ -11,7 +11,7 @@ body.dragging, body.dragging * { #wikitree { list-style-type: none; } -#wikitree .ident { +#wikitree .indent, .separator { appearance: none; -webkit-appearance: none; outline: none; @@ -20,8 +20,9 @@ body.dragging, body.dragging * { padding-right: 3px; padding-left: 3px; cursor: default; + color: transparent; } -#wikitree .branch { +#wikitree .branch, .expandAll, .collapseAll, .gotoSelected { appearance: none; -webkit-appearance: none; outline: none; diff --git a/Helper/WikiHelper.php b/Helper/WikiHelper.php index 262d20e..b81f1a7 100644 --- a/Helper/WikiHelper.php +++ b/Helper/WikiHelper.php @@ -14,6 +14,7 @@ class WikiHelper extends Base * @var string */ const WIKITABLE = 'wikipage'; + /** * Get all Wiki Pages by order for a project * @@ -28,6 +29,7 @@ public function getWikipages($project_id) // return $this->wikiModel->getWikipages($project['id']); // return $this->db->table(self::WIKITABLE)->eq('project_id', $project_id)->desc('order')->findAll(); } + /** * Add a Javascript asset * @@ -39,6 +41,7 @@ public function js($filepath, $async = false) { return ''; } + /** * render wiki page html children recursively * @param mixed $children @@ -48,29 +51,34 @@ public function js($filepath, $async = false) * @param mixed $not_editable * @return string */ - public function renderChildren($children, $parent_id, $project, $selected_wiki_id, $not_editable){ + public function renderChildren($children, $parent_id, $project, $selected_wiki_id, $not_editable) { $html = '
                  '; foreach ($children as $item) { $is_active = ($selected_wiki_id == $item['id']) ? ' active' : ''; $html .= '
                • '; if(count($item['children']) > 0){ - $html .= ''; + $html .= ''; + $wikipage_icon = 'folder-o'; } else { - $html .= ''; + $html .= ''; + $wikipage_icon = 'file-word-o'; } - $html .= ''; + $html .= ''; if(!$not_editable){ - $html .= $this->helper->url->link( - t($item['title']), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $item['id']), false, 'wikilink'.$is_active + $html .= $this->helper->url->icon( + $wikipage_icon, t($item['title']), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $item['id']), false, 'wikilink'.$is_active ); - $html .= ''; + $html .= ''; + $html .= '
                  '; + $html .= $this->helper->modal->medium('edit', '', 'WikiController', 'edit', array('plugin' => 'wiki', 'wiki_id' => $item['id'])); $html .= $this->helper->modal->confirm('trash-o', '', 'WikiController', 'confirm', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $item['id'])); + $html .= '
                  '; } else { $html .= $this->helper->url->link( t($item['title']), 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $item['id']), false, 'wikilink'.$is_active ); } - if(count($item['children']) > 0){ + if(count($item['children']) > 0) { $html .= $this->renderChildren($item['children'], $item['id'], $project, $selected_wiki_id, $not_editable); } $html .= '
                  • '; diff --git a/Template/wiki/sidebar.php b/Template/wiki/sidebar.php index 109b3dc..55e7df0 100755 --- a/Template/wiki/sidebar.php +++ b/Template/wiki/sidebar.php @@ -27,6 +27,11 @@

                  Wiki

                  +
                  + + + +
                  From 8e9e105fd1080132722a4cb543a67c4896258b09 Mon Sep 17 00:00:00 2001 From: "Im[F(x)]" Date: Wed, 30 Oct 2024 09:55:15 +0200 Subject: [PATCH 20/50] * introducing a helper method to generate indented wiki treeview list * using it for the wiki overview and for the parent page dropdown in editing wiki page modal dialog * fixed the bug that a wiki page could assign a parent from its own subtree, thus effectively and irreversibly breaking the wiki page hierarchy --- Controller/WikiController.php | 34 ++++++++++----------- Helper/WikiHelper.php | 30 ++++++++++++++++--- Template/wiki/detail.php | 11 ++++--- Template/wiki/edit.php | 2 +- Template/wiki/editions.php | 2 +- Template/wiki/show.php | 56 +++++++++++++++++++++-------------- 6 files changed, 84 insertions(+), 51 deletions(-) diff --git a/Controller/WikiController.php b/Controller/WikiController.php index b8c3e9b..f4bec56 100755 --- a/Controller/WikiController.php +++ b/Controller/WikiController.php @@ -63,11 +63,15 @@ public function readonly() throw AccessForbiddenException::getInstance()->withoutLayout(); } + $wikipages = $this->wikiModel->getWikipages($project['id']); + $result = $this->prepareWikipagesTree($wikipages); + $wiki_list = $this->helper->wikiHelper->generateIndentedChildren($result['tree'], true); + $this->response->html($this->helper->layout->app('wiki:wiki/show', array( 'project' => $project, 'not_editable' => true, 'title' => $project['name'], - 'wikipages' => $this->wikiModel->getWikipages($project['id']), + 'wikipages' => $wiki_list, ))); } @@ -82,10 +86,14 @@ public function show() $project = $this->getProject(); + $wikipages = $this->wikiModel->getWikipages($project['id']); + $result = $this->prepareWikipagesTree($wikipages); + $wiki_list = $this->helper->wikiHelper->generateIndentedChildren($result['tree'], true); + $this->response->html($this->helper->layout->app('wiki:wiki/show', array( 'project' => $project, 'title' => $project['name'], - 'wikipages' => $this->wikiModel->getWikipages($project['id']), + 'wikipages' => $wiki_list, ))); // ,array( @@ -99,7 +107,7 @@ public function editions() $wiki_id = $this->request->getIntegerParam('wiki_id'); $wikipages = $this->wikiModel->getWikipages($project['id']); - $result =$this->prepareWikipagesTree($wikipages, $wiki_id); + $result = $this->prepareWikipagesTree($wikipages, $wiki_id); $this->response->html($this->helper->layout->app('wiki:wiki/editions', array( 'project' => $project, @@ -114,7 +122,6 @@ public function editions() public function edit(array $values = array(), array $errors = array()) { - $wiki_id = $this->request->getIntegerParam('wiki_id'); $editwiki = $this->wikiModel->getWikipage($wiki_id); @@ -125,16 +132,9 @@ public function edit(array $values = array(), array $errors = array()) // } $wikipages = $this->wikiModel->getWikipages($editwiki['project_id']); + $result = $this->prepareWikipagesTree($wikipages, $wiki_id); + $wiki_list = $this->helper->wikiHelper->generateIndentedChildren($result['tree'], false, 0, $wiki_id); - $wiki_list = array('' => t('None')); - - foreach ($wikipages as $page) { - if (t($wiki_id) != t($page['id'])) { - $wiki_list[$page['id']] = $page['title']; - } - } - - // $values['wikipage'] $this->response->html($this->helper->layout->app('wiki:wiki/edit', array( 'wiki_id' => $wiki_id, 'values' => $editwiki, @@ -155,7 +155,7 @@ public function detail_readonly() { $wiki_id = $this->request->getIntegerParam('wiki_id'); $wikipages = $this->wikiModel->getWikipages($project['id']); - $result =$this->prepareWikipagesTree($wikipages, $wiki_id); + $result = $this->prepareWikipagesTree($wikipages, $wiki_id); // use a wiki helper for better side bar TODO: $this->response->html($this->helper->layout->app('wiki:wiki/detail', array( @@ -181,7 +181,7 @@ public function detail() $wiki_id = $this->request->getIntegerParam('wiki_id'); $wikipages = $this->wikiModel->getWikipages($project['id']); - $result =$this->prepareWikipagesTree($wikipages, $wiki_id); + $result = $this->prepareWikipagesTree($wikipages, $wiki_id); // use a wiki helper for better side bar TODO: $this->response->html($this->helper->layout->app('wiki:wiki/detail', array( @@ -245,13 +245,13 @@ private function getNestedChildren($parent_id, $items) { return $children; } - private function prepareWikipagesTree($wikipages, $wiki_id) { + private function prepareWikipagesTree($wikipages, $selected_wiki_id = 0) { $treeWikipages = array(); $defaultWikipage = null; $selectedWikipage = null; foreach ($wikipages as $page) { - if (t($wiki_id) == t($page['id'])) { + if ($selected_wiki_id == $page['id']) { $selectedWikipage = $page; } if(!isset($page['parent_id'])){ diff --git a/Helper/WikiHelper.php b/Helper/WikiHelper.php index b81f1a7..4d06f78 100644 --- a/Helper/WikiHelper.php +++ b/Helper/WikiHelper.php @@ -87,8 +87,30 @@ public function renderChildren($children, $parent_id, $project, $selected_wiki_i return $html; } - // public function doSomething() - // { - // return 'foobar'; - // } + /** + * generate indented sublist of children + * @param mixed $children + * @param mixed $parent_id + */ + public function generateIndentedChildren($children, $use_full_pages = false, $parent_id = 0, $exclude_wiki_id = 0, $indent = 0) { + $indentedChildren = array(); + if ($parent_id == 0) { + $indentedChildren[''] = t('(root)'); + } + foreach ($children as $item) { + if ($exclude_wiki_id != $item['id']) { + if ($use_full_pages) { + $item['title'] = str_repeat(' ', ($indent + 1) * 4) . ' ' . $item['title']; + $indentedChildren[$item['id']] = $item; + } else { + $indentedChildren[$item['id']] = str_repeat(' ', ($indent + 1) * 4) . ' ' . $item['title']; + } + if (count($item['children']) > 0) { + $nestedChildren = $this->generateIndentedChildren($item['children'], $use_full_pages, $item['id'], $exclude_wiki_id, $indent + 1); + $indentedChildren += $nestedChildren; + } + } + } + return $indentedChildren; + } } diff --git a/Template/wiki/detail.php b/Template/wiki/detail.php index 7b992ba..faf8716 100755 --- a/Template/wiki/detail.php +++ b/Template/wiki/detail.php @@ -19,18 +19,17 @@

                  - form->label(t('is a child of'), 'is a child of')?> - url->link($wikipage['parent_id'], 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wikipage['parent_id']))?> + url->icon('level-up', t('Parent Page'), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wikipage['parent_id']))?> - url->link($wikipage['parent_id'], 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $wikipage['parent_id']))?> + url->icon('level-up', t('Parent Page'), 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $wikipage['parent_id']))?> -
                  -
                  + modal->medium('edit', t('Edit page'), 'WikiController', 'edit', array('plugin' => 'wiki', 'wiki_id' => $wikipage['id']))?> -
                  + helper->modal->confirm('trash-o', t('Remove page'), 'WikiController', 'confirm', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wikipage['id']))?> + url->icon('window-restore', t('View Editions'), 'WikiController', 'editions', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wikipage['id']))?>
                  diff --git a/Template/wiki/edit.php b/Template/wiki/edit.php index 1cd51a1..4396ade 100644 --- a/Template/wiki/edit.php +++ b/Template/wiki/edit.php @@ -13,7 +13,7 @@ form->text('title', $values, $errors, array('required', 'maxlength="255"', 'autofocus', 'tabindex="1"')) ?>
                  - form->label(t('is a child of'), 'is a child of') ?> + form->label(t('Parent Page'), 'Parent Page') ?> form->select('parent_id', $wiki_list, $values, $errors) ?>

                  diff --git a/Template/wiki/editions.php b/Template/wiki/editions.php index a8c1012..92c00a9 100755 --- a/Template/wiki/editions.php +++ b/Template/wiki/editions.php @@ -30,7 +30,7 @@

                  - modal->confirm('undo', '', 'WikiController', 'confirm_restore', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wiki_id, 'edition' => $edition['edition']))?> + modal->confirm('history', '', 'WikiController', 'confirm_restore', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wiki_id, 'edition' => $edition['edition']))?>

                  diff --git a/Template/wiki/show.php b/Template/wiki/show.php index dfe4579..1191c31 100755 --- a/Template/wiki/show.php +++ b/Template/wiki/show.php @@ -34,36 +34,47 @@ Last modifier Modified --> - - - - - - - - - - - +
                  + + + + + + + + + + + - - - + + @@ -73,7 +84,8 @@ - + +
                  + $wikipage): ?> + +
                  - url->link(t($wikipage['title']), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wikipage['id']))?> - modal->confirm('trash-o', '', 'WikiController', 'confirm', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wikipage['id']))?> + modal->medium('edit', '', 'WikiController', 'edit', array('plugin' => 'wiki', 'wiki_id' => $wikipage_id))?> + modal->confirm('trash-o', '', 'WikiController', 'confirm', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wikipage_id))?> + + + + url->link(t($wikipage['title']), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wikipage_id))?> - url->link(t($wikipage['title']), 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $wikipage['id']))?> + url->link(t($wikipage['title']), 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $wikipage_id))?> - + - - url->link($wikipage['parent_id'], 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wikipage['parent_id']))?> + + + url->link($wikipage['parent_id'], 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wikipage['parent_id']))?> + + url->link($wikipage['parent_id'], 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $wikipage['parent_id']))?> + - url->link($wikipage['parent_id'], 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $wikipage['parent_id']))?> + text->e($wikipage['modifier_name'] ?: $wikipage['modifier_username'])?> dt->date($wikipage['date_modification'])?>
                  From 990f1cff96c75c2ea2f0b043439706522f733097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alfred=20B=C3=BChler?= Date: Wed, 30 Oct 2024 11:13:27 +0100 Subject: [PATCH 21/50] Fix absent 'children' field in public pages --- Template/wiki/detail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Template/wiki/detail.php b/Template/wiki/detail.php index 8286ae6..4b028ad 100755 --- a/Template/wiki/detail.php +++ b/Template/wiki/detail.php @@ -47,7 +47,7 @@ url->link(t($page['title']), 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $page['id']))?> - 0): ?> + 0): ?> wikiHelper->renderChildren($page['children'], $page['id'], $project, $not_editable)?> From 15d3df9fc392757f168c07381db6776d4d64fb2b Mon Sep 17 00:00:00 2001 From: "Im[F(x)]" Date: Wed, 30 Oct 2024 15:18:56 +0200 Subject: [PATCH 22/50] * adjusting colors and positioning for the wiki pages action buttons edit/delete * adjusting colors and positioning for links in the detail wiki template * adjusting clear style for all main containers --- Asset/css/wiki.css | 26 +++++++++++++++++++++++--- Helper/WikiHelper.php | 26 ++++++++++++++++---------- Template/wiki/detail.php | 21 ++++++++++++--------- Template/wiki/editions.php | 4 ++-- Template/wiki/show.php | 24 +++++++++++++----------- Template/wiki/sidebar.php | 17 +++-------------- 6 files changed, 69 insertions(+), 49 deletions(-) diff --git a/Asset/css/wiki.css b/Asset/css/wiki.css index 340f1e4..58856dc 100644 --- a/Asset/css/wiki.css +++ b/Asset/css/wiki.css @@ -8,6 +8,18 @@ body.dragging, body.dragging * { z-index: 2000; } +.wikicontent { + clear: both; +} + +.wikisidebar { + height: 100%; + resize: horizontal; + overflow: auto; + max-width: 50% !important; + min-width: 384px !important; +} + #wikitree { list-style-type: none; } @@ -22,7 +34,7 @@ body.dragging, body.dragging * { cursor: default; color: transparent; } -#wikitree .branch, .expandAll, .collapseAll, .gotoSelected { +#wikitree .branch, #wikitree .action, #wikilist .action, .expandAll, .collapseAll, .gotoSelected { appearance: none; -webkit-appearance: none; outline: none; @@ -31,28 +43,36 @@ body.dragging, body.dragging * { padding-right: 3px; padding-left: 3px; cursor: pointer; + position: relative; + z-index: 2; } -#wikitree li { +#wikitree li, #wikilist li { line-height: normal !important; } -#wikitree li:last-child { +#wikitree li:last-child, #wikilist li:last-child { margin-bottom: 0px !important; } #wikitree .wikilink.active { box-shadow: 0 0 10px #777777 inset; } +#wikitree button a .fa, #wikilist button a .fa { + color: var(--link-color-primary); +} .wikilink { padding-top: 3px; padding-bottom: 3px; padding-left: 10px; padding-right: 10px; + white-space: nowrap; + z-index: 1; } .wikipage { padding-bottom: 5px; padding-top: 5px; text-align: left; + white-space: nowrap; } .wikipage.dragElem { opacity: 0.4; diff --git a/Helper/WikiHelper.php b/Helper/WikiHelper.php index 4d06f78..1b8c20e 100644 --- a/Helper/WikiHelper.php +++ b/Helper/WikiHelper.php @@ -55,8 +55,19 @@ public function renderChildren($children, $parent_id, $project, $selected_wiki_i $html = '
                    '; foreach ($children as $item) { $is_active = ($selected_wiki_id == $item['id']) ? ' active' : ''; + $has_children = isset($item['children']) && (count($item['children']) > 0); $html .= '
                  • '; - if(count($item['children']) > 0){ + if(!$not_editable) { + $html .= '
                    '; + $html .= ''; + $html .= ''; + $html .= '
                    '; + } + if($has_children){ $html .= ''; $wikipage_icon = 'folder-o'; } else { @@ -64,21 +75,16 @@ public function renderChildren($children, $parent_id, $project, $selected_wiki_i $wikipage_icon = 'file-word-o'; } $html .= ''; - if(!$not_editable){ + if(!$not_editable) { $html .= $this->helper->url->icon( $wikipage_icon, t($item['title']), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $item['id']), false, 'wikilink'.$is_active ); - $html .= ''; - $html .= '
                    '; - $html .= $this->helper->modal->medium('edit', '', 'WikiController', 'edit', array('plugin' => 'wiki', 'wiki_id' => $item['id'])); - $html .= $this->helper->modal->confirm('trash-o', '', 'WikiController', 'confirm', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $item['id'])); - $html .= '
                    '; } else { - $html .= $this->helper->url->link( - t($item['title']), 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $item['id']), false, 'wikilink'.$is_active + $html .= $this->helper->url->icon( + $wikipage_icon, t($item['title']), 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $item['id']), false, 'wikilink'.$is_active ); } - if(count($item['children']) > 0) { + if($has_children) { $html .= $this->renderChildren($item['children'], $item['id'], $project, $selected_wiki_id, $not_editable); } $html .= '
                    • '; diff --git a/Template/wiki/detail.php b/Template/wiki/detail.php index faf8716..341e02c 100755 --- a/Template/wiki/detail.php +++ b/Template/wiki/detail.php @@ -6,7 +6,7 @@ projectHeader->render($project, 'TaskListController', 'show') ?> -
                    +
                    render('wiki:wiki/sidebar', array( 'project' => $project, @@ -18,19 +18,19 @@

                    + + modal->medium('edit', t('Edit page'), 'WikiController', 'edit', array('plugin' => 'wiki', 'wiki_id' => $wikipage['id']))?> + helper->modal->confirm('trash-o', t('Remove page'), 'WikiController', 'confirm', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wikipage['id']))?> + + url->icon('window-restore', t('View Editions'), 'WikiController', 'editions', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wikipage['id']))?> + + url->icon('level-up', t('Parent Page'), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wikipage['parent_id']))?> url->icon('level-up', t('Parent Page'), 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $wikipage['parent_id']))?> - - - - modal->medium('edit', t('Edit page'), 'WikiController', 'edit', array('plugin' => 'wiki', 'wiki_id' => $wikipage['id']))?> - helper->modal->confirm('trash-o', t('Remove page'), 'WikiController', 'confirm', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wikipage['id']))?> - - url->icon('window-restore', t('View Editions'), 'WikiController', 'editions', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wikipage['id']))?>
                      @@ -45,11 +45,12 @@
                    • : dt->date($wikipage['date_modification'])?>
                    +
                    +

                    -
                    text->markdown($wikipage['content'])?>
                    @@ -79,6 +80,8 @@ +
                    +
                    diff --git a/Template/wiki/editions.php b/Template/wiki/editions.php index 92c00a9..3109545 100755 --- a/Template/wiki/editions.php +++ b/Template/wiki/editions.php @@ -6,7 +6,7 @@ projectHeader->render($project, 'TaskListController', 'show') ?> -
                    +
                    render('wiki:wiki/sidebar', array( 'project' => $project, @@ -46,7 +46,7 @@

                  - + - +
                  @@ -52,15 +46,23 @@ -
                  + + + - url->link(t($wikipage['title']), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wikipage_id))?> +
                  • + url->link(t($wikipage['title']), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wikipage_id), false, 'wikilink')?> +
                  - url->link(t($wikipage['title']), 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $wikipage_id))?> +
                  • + url->link(t($wikipage['title']), 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $wikipage_id), false, 'wikilink')?> +
                  		diff --git a/Template/wiki/sidebar.php b/Template/wiki/sidebar.php index 55e7df0..7c0fff0 100755 --- a/Template/wiki/sidebar.php +++ b/Template/wiki/sidebar.php @@ -1,15 +1,4 @@ - - -
                  +
                  wikiHelper->js("plugins/Wiki/Asset/vendor/jquery-sortable/jquery-sortable.js")?> @@ -26,11 +15,11 @@

                  -

                  Wiki

                  +

                  + -
                  From d5692c7abde8ee996d7d952f12d123b5fbdd07ee Mon Sep 17 00:00:00 2001 From: "Im[F(x)]" Date: Wed, 30 Oct 2024 15:36:24 +0200 Subject: [PATCH 23/50] * fixed the `generateIndentedChildren` helper in regard with the `parent_id` parameter that was not used properly to obtain sublists * added a collapsable list of subpages in the detail wiki page template * now getting proper sublists with reduced indent for the wiki overview page and the detail wiki page template --- Controller/WikiController.php | 17 ++++++++--------- Helper/WikiHelper.php | 22 ++++++++++++++-------- Template/wiki/detail.php | 35 ++++++++++++++++++++++++++++++++++- 3 files changed, 56 insertions(+), 18 deletions(-) diff --git a/Controller/WikiController.php b/Controller/WikiController.php index f4bec56..cc8721d 100755 --- a/Controller/WikiController.php +++ b/Controller/WikiController.php @@ -65,7 +65,7 @@ public function readonly() $wikipages = $this->wikiModel->getWikipages($project['id']); $result = $this->prepareWikipagesTree($wikipages); - $wiki_list = $this->helper->wikiHelper->generateIndentedChildren($result['tree'], true); + $wiki_list = $this->helper->wikiHelper->generateIndentedChildren($result['tree'], true, 0, 0, -1); $this->response->html($this->helper->layout->app('wiki:wiki/show', array( 'project' => $project, @@ -88,7 +88,7 @@ public function show() $wikipages = $this->wikiModel->getWikipages($project['id']); $result = $this->prepareWikipagesTree($wikipages); - $wiki_list = $this->helper->wikiHelper->generateIndentedChildren($result['tree'], true); + $wiki_list = $this->helper->wikiHelper->generateIndentedChildren($result['tree'], true, 0, 0, -1); $this->response->html($this->helper->layout->app('wiki:wiki/show', array( 'project' => $project, @@ -156,6 +156,7 @@ public function detail_readonly() { $wikipages = $this->wikiModel->getWikipages($project['id']); $result = $this->prepareWikipagesTree($wikipages, $wiki_id); + $wikipage_sublist = $this->helper->wikiHelper->generateIndentedChildren($result['tree'], false, $wiki_id, 0, -1); // use a wiki helper for better side bar TODO: $this->response->html($this->helper->layout->app('wiki:wiki/detail', array( @@ -166,8 +167,9 @@ public function detail_readonly() { 'not_editable' => true, 'files' => $this->wikiFileModel->getAllDocuments($wiki_id), 'images' => $this->wikiFileModel->getAllImages($wiki_id), - 'wikipage' => $result['selected'], 'wikipages' => $result['tree'], + 'wikipage' => $result['selected'], + 'wikipage_sublist' => $wikipage_sublist, ))); } @@ -182,6 +184,7 @@ public function detail() $wikipages = $this->wikiModel->getWikipages($project['id']); $result = $this->prepareWikipagesTree($wikipages, $wiki_id); + $wikipage_sublist = $this->helper->wikiHelper->generateIndentedChildren($result['tree'], false, $wiki_id, 0, -1); // use a wiki helper for better side bar TODO: $this->response->html($this->helper->layout->app('wiki:wiki/detail', array( @@ -191,8 +194,9 @@ public function detail() 'wiki' => $result['selected'], 'files' => $this->wikiFileModel->getAllDocuments($wiki_id), 'images' => $this->wikiFileModel->getAllImages($wiki_id), - 'wikipage' => $result['selected'], 'wikipages' => $result['tree'], + 'wikipage' => $result['selected'], + 'wikipage_sublist' => $wikipage_sublist, ))); // $wikipage= $wikipages->select(1)->eq('id', $wiki_id)->findOne(); @@ -203,14 +207,9 @@ public function detail() // 'project' => $project, // 'title' => $project['name'], // 'wiki_id' => $wiki_id, - // // 'wikipage' => $this->wikiModel->getWikipage($wiki_id), // 'wikipage' => $wikipage, // 'wikipages' => $wikipages, // ))); - - // ,array( - // 'wikipages' => $this->wikiModel->getWikipages($project['id']) - // ) } // public function breakdown() diff --git a/Helper/WikiHelper.php b/Helper/WikiHelper.php index 1b8c20e..f77c40a 100644 --- a/Helper/WikiHelper.php +++ b/Helper/WikiHelper.php @@ -105,14 +105,20 @@ public function generateIndentedChildren($children, $use_full_pages = false, $pa } foreach ($children as $item) { if ($exclude_wiki_id != $item['id']) { - if ($use_full_pages) { - $item['title'] = str_repeat(' ', ($indent + 1) * 4) . ' ' . $item['title']; - $indentedChildren[$item['id']] = $item; - } else { - $indentedChildren[$item['id']] = str_repeat(' ', ($indent + 1) * 4) . ' ' . $item['title']; - } - if (count($item['children']) > 0) { - $nestedChildren = $this->generateIndentedChildren($item['children'], $use_full_pages, $item['id'], $exclude_wiki_id, $indent + 1); + $has_children = isset($item['children']) && (count($item['children']) > 0); + if ($parent_id == 0 || $parent_id == $item['parent_id']) { + if ($use_full_pages) { + $item['title'] = str_repeat(' ', ($indent + 1) * 4) . ' ' . $item['title']; + $indentedChildren[$item['id']] = $item; + } else { + $indentedChildren[$item['id']] = str_repeat(' ', ($indent + 1) * 4) . ' ' . $item['title']; + } + if ($has_children) { + $nestedChildren = $this->generateIndentedChildren($item['children'], $use_full_pages, $item['id'], $exclude_wiki_id, $indent + 1); + $indentedChildren += $nestedChildren; + } + } elseif ($has_children) { + $nestedChildren = $this->generateIndentedChildren($item['children'], $use_full_pages, $parent_id, $exclude_wiki_id, $indent); $indentedChildren += $nestedChildren; } } diff --git a/Template/wiki/detail.php b/Template/wiki/detail.php index 341e02c..a189191 100755 --- a/Template/wiki/detail.php +++ b/Template/wiki/detail.php @@ -33,7 +33,11 @@
                  -
                    + +
                    +
                      +
                      +

                       0): ?>
                    • : text->e($wikipage['creator_name'] ?: $wikipage['creator_username'])?>
                      • @@ -43,7 +47,36 @@
                    • : :
                    • : dt->date($wikipage['date_creation'])?>
                    • : dt->date($wikipage['date_modification'])?>
                      • +
                      +
                    +
                    + +
                       
                    + +
                    +
                      +
                      +

                       + + $subpage_title): ?> + +
                    • + url->link(t($subpage_title), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $subpage_id), false, 'wikilink')?> +
                      • + +
                    • + url->link(t($subpage_title), 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $subpage_id), false, 'wikilink')?> +
                      • + + + +
                    • + +
                      • + +
                    +

                    From fc467a02460aa660ec4f91457134199ebdfcee41 Mon Sep 17 00:00:00 2001 From: "Im[F(x)]" Date: Wed, 30 Oct 2024 16:25:50 +0200 Subject: [PATCH 24/50] * added routes for all implemented actions for wiki pages and files --- Plugin.php | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/Plugin.php b/Plugin.php index 22cc28f..80e1a06 100755 --- a/Plugin.php +++ b/Plugin.php @@ -17,18 +17,28 @@ public function initialize() $this->projectAccessMap->add('WikiFileViewController', '*', Role::PROJECT_MEMBER); $this->applicationAccessMap->add('WikiController', array('readonly','detail_readonly'), Role::APP_PUBLIC); - // page routes - $this->route->addRoute('/wiki/project/:project_id', 'WikiController', 'show', 'wiki'); - $this->route->addRoute('/wiki/project/:project_id/readonly', 'WikiController', 'readonly', 'wiki'); - $this->route->addRoute('/wiki/project/:project_id/detail/:wiki_id', 'WikiController', 'detail', 'wiki'); - $this->route->addRoute('/wiki/project/:project_id/detail/:wiki_id/readonly', 'WikiController', 'detail_readonly', 'wiki'); - $this->route->addRoute('/wiki/project/:project_id/editions/:wiki_id', 'WikiController', 'editions', 'wiki'); - // $this->route->addRoute('/wiki/project/:project_id/breakdown', 'WikiController', 'breakdown', 'wiki'); - $this->route->addRoute('/wiki/file/:file_id', 'WikiFileViewController', 'show', 'wiki'); - $this->route->addRoute('/wiki/file/:file_id/image', 'WikiFileViewController', 'image', 'wiki'); - $this->route->addRoute('/wiki/file/:file_id/thumbnail', 'WikiFileViewController', 'thumbnail', 'wiki'); - $this->route->addRoute('/wiki/file/:file_id/browser', 'WikiFileViewController', 'browser', 'wiki'); - $this->route->addRoute('/wiki/file/:file_id/download', 'WikiFileViewController', 'download', 'wiki'); + // page routes wiki pages + $this->route->addRoute('/wiki/index', 'WikiController', 'index', 'wiki'); + $this->route->addRoute('/wiki/project/:project_id', 'WikiController', 'show', 'wiki'); + $this->route->addRoute('/wiki/project/:project_id/readonly', 'WikiController', 'readonly', 'wiki'); + $this->route->addRoute('/wiki/project/:project_id/detail/:wiki_id', 'WikiController', 'detail', 'wiki'); + $this->route->addRoute('/wiki/project/:project_id/detail/:wiki_id/readonly', 'WikiController', 'detail_readonly', 'wiki'); + $this->route->addRoute('/wiki/project/:project_id/editions/:wiki_id', 'WikiController', 'editions', 'wiki'); + // $this->route->addRoute('/wiki/project/:project_id/breakdown', 'WikiController', 'breakdown', 'wiki'); + $this->route->addRoute('/wiki/project/:project_id/create', 'WikiController', 'create', 'wiki'); + $this->route->addRoute('/wiki/edit/:wiki_id', 'WikiController', 'edit', 'wiki'); + $this->route->addRoute('/wiki/project/:project_id/remove/:wiki_id', 'WikiController', 'confirm', 'wiki'); + $this->route->addRoute('/wiki/project/:project_id/restore/:wiki_id', 'WikiController', 'confirm_restore', 'wiki'); + + // page routes wiki files + $this->route->addRoute('/wiki/file/:project_id/create/:wiki_id', 'WikiFileController', 'create', 'wiki'); + $this->route->addRoute('/wiki/file/:project_id/screenshot/:wiki_id', 'WikiFileController', 'screenshot', 'wiki'); + $this->route->addRoute('/wiki/file/:project_id/remove/:wiki_id/:file_id', 'WikiFileController', 'confirm', 'wiki'); + $this->route->addRoute('/wiki/file/:file_id', 'WikiFileViewController', 'show', 'wiki'); + $this->route->addRoute('/wiki/file/:file_id/image', 'WikiFileViewController', 'image', 'wiki'); + $this->route->addRoute('/wiki/file/:file_id/thumbnail', 'WikiFileViewController', 'thumbnail', 'wiki'); + $this->route->addRoute('/wiki/file/:file_id/browser', 'WikiFileViewController', 'browser', 'wiki'); + $this->route->addRoute('/wiki/file/:file_id/download', 'WikiFileViewController', 'download', 'wiki'); // template hooks $this->template->hook->attach('template:config:sidebar', 'Wiki:config/sidebar'); From d87247363bcb899420ebca94481c59c1bf49d735 Mon Sep 17 00:00:00 2001 From: "Im[F(x)]" Date: Thu, 31 Oct 2024 23:20:08 +0200 Subject: [PATCH 25/50] * added tooltips for action buttons of `wikitree` and `wikilist` --- Asset/Javascript/wiki.js | 10 ++++++++++ Helper/WikiHelper.php | 6 +++--- Template/wiki/show.php | 4 ++-- Template/wiki/sidebar.php | 6 +++--- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Asset/Javascript/wiki.js b/Asset/Javascript/wiki.js index a701286..9f7b0d8 100644 --- a/Asset/Javascript/wiki.js +++ b/Asset/Javascript/wiki.js @@ -5,6 +5,16 @@ jQuery(document).ready(function () { $('.input-addon-field').hide(); $('.input-addon-item').hide(); + //-------------------------------------- + // override titles for links from their container buttons + //-------------------------------------- + $("#wikitree").find(".action a").each(function () { + $(this).attr('title', $(this).parent().attr('title')); + }); + $("#wikilist").find(".action a").each(function () { + $(this).attr('title', $(this).parent().attr('title')); + }); + //-------------------------------------- // handle collapse/expand of wikitree branches //-------------------------------------- diff --git a/Helper/WikiHelper.php b/Helper/WikiHelper.php index f77c40a..3145eab 100644 --- a/Helper/WikiHelper.php +++ b/Helper/WikiHelper.php @@ -59,16 +59,16 @@ public function renderChildren($children, $parent_id, $project, $selected_wiki_i $html .= '
                  • '; if(!$not_editable) { $html .= '
                    '; - $html .= ''; - $html .= ''; $html .= '
                    '; } if($has_children){ - $html .= ''; + $html .= ''; $wikipage_icon = 'folder-o'; } else { $html .= ''; diff --git a/Template/wiki/show.php b/Template/wiki/show.php index 4ded08c..eb2b2c4 100755 --- a/Template/wiki/show.php +++ b/Template/wiki/show.php @@ -46,10 +46,10 @@
                  - - diff --git a/Template/wiki/sidebar.php b/Template/wiki/sidebar.php index 7c0fff0..885229d 100755 --- a/Template/wiki/sidebar.php +++ b/Template/wiki/sidebar.php @@ -17,9 +17,9 @@

                  - - - + + +
                  From 0048c23202027054b8688d4274a692b957f9c006 Mon Sep 17 00:00:00 2001 From: "Im[F(x)]" Date: Fri, 1 Nov 2024 08:07:24 +0200 Subject: [PATCH 26/50] * adjusting style for dragged wikipage in wikitree + added style for a placeholder for better visualization where the dragged wikipage will be moved * added an explicit handle to drag wikipages in wikitree for mobile + fixed the `jquery-sortable` lib to properly handle touches and mobile drag * fixed the base `wikitree`
                    to contain an initial
                  • item so to be able to rearrange root wikipages and their mutual subpages + added empty
                      to the leaves of the wikitree, so to allow dragging subitems into them --- Asset/Javascript/wiki.js | 27 +++++-- Asset/css/wiki.css | 75 ++++++++++++------- .../vendor/jquery-sortable/jquery-sortable.js | 17 +++-- Helper/WikiHelper.php | 66 ++++++++-------- Template/wiki/sidebar.php | 9 ++- 5 files changed, 117 insertions(+), 77 deletions(-) diff --git a/Asset/Javascript/wiki.js b/Asset/Javascript/wiki.js index 9f7b0d8..456548a 100644 --- a/Asset/Javascript/wiki.js +++ b/Asset/Javascript/wiki.js @@ -1,4 +1,13 @@ jQuery(document).ready(function () { + //-------------------------------------- + // device detection + //-------------------------------------- + let isMobile = false; + if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|ipad|iris|kindle|Android|Silk|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.test(navigator.userAgent) + || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw-(n|u)|c55\/|capi|ccwa|cdm-|cell|chtm|cldc|cmd-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc-s|devi|dica|dmob|do(c|p)o|ds(12|-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(-|_)|g1 u|g560|gene|gf-5|g-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd-(m|p|t)|hei-|hi(pt|ta)|hp( i|ip)|hs-c|ht(c(-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i-(20|go|ma)|i230|iac( |-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|-[a-w])|libw|lynx|m1-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|-([1-8]|c))|phil|pire|pl(ay|uc)|pn-2|po(ck|rt|se)|prox|psio|pt-g|qa-a|qc(07|12|21|32|60|-[2-7]|i-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h-|oo|p-)|sdk\/|se(c(-|0|1)|47|mc|nd|ri)|sgh-|shar|sie(-|m)|sk-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h-|v-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl-|tdg-|tel(i|m)|tim-|t-mo|to(pl|sh)|ts(70|m-|m3|m5)|tx-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas-|your|zeto|zte-/i.test(navigator.userAgent.substr(0,4))) { + isMobile = true; + } + //-------------------------------------- // hide the KB filters toolbar //-------------------------------------- @@ -72,22 +81,19 @@ jQuery(document).ready(function () { gotoSelectedWikipageBranch(); }); - $('.branch').click(function () { + $('#wikitree .branch').click(function () { const button = $(this).find("a i")[0]; const branch = $(this).parent().find("ul")[0]; - console.log(branch); if ($(button).hasClass('fa-minus-square-o')) { $(button).removeClass('fa-minus-square-o'); $(button).addClass('fa-plus-square-o'); $(branch).hide(); - console.log('hide') return; } if ($(button).hasClass('fa-plus-square-o')) { $(button).removeClass('fa-plus-square-o'); $(button).addClass('fa-minus-square-o'); $(branch).show(); - console.log('show') return; } }); @@ -99,9 +105,18 @@ jQuery(document).ready(function () { //-------------------------------------- // page reorder and nesting support using jquery sorting plugin //-------------------------------------- - if($("#wikitree").data("reorder-url")){ + if($("#wikitree").length == 1 && $("#wikitree").data("reorder-url")) { + if (isMobile) { + $(".sortable-handle").show(); + } + $('#wikitree').sortable({ nested: true, + itemSelector: ".wikipage", + placeholder: '
                    • ', + placeholderClass: "sortable-placeholder", + draggedClass: "sortable-dragged", + handle: isMobile ? ".sortable-handle" : ".wikilink", onDrop: function ($item, container, _super) { // console.log("onDrop", $item, container, _super) container.el.removeClass("active"); @@ -143,6 +158,6 @@ jQuery(document).ready(function () { }); _super($item, container); }, - }) + }); } }); diff --git a/Asset/css/wiki.css b/Asset/css/wiki.css index 58856dc..7e26e00 100644 --- a/Asset/css/wiki.css +++ b/Asset/css/wiki.css @@ -1,11 +1,32 @@ body.dragging, body.dragging * { cursor: move !important; } - -.dragged { + +.sortable-dragged { + position: absolute; + opacity: 0.75; + background: rgba(255, 250, 144, 0.15); + z-index: 2000 !important; +} + +.sortable-placeholder { + position: relative; + margin: 0; + padding: 0; + height: 16px; + background: rgba(255, 250, 144, 0.5); +} +.sortable-placeholder:before { position: absolute; - opacity: 0.5; - z-index: 2000; + content: ""; + width: 0; + height: 0; + margin-top: -5px; + left: -5px; + top: -4px; + border: 5px solid transparent; + border-left-color: red; + border-right: none; } .wikicontent { @@ -20,6 +41,22 @@ body.dragging, body.dragging * { min-width: 384px !important; } +.wikipage { + padding-bottom: 5px; + padding-top: 5px; + text-align: left; + white-space: nowrap; +} + +.wikilink { + padding-top: 3px; + padding-bottom: 3px; + padding-left: 10px; + padding-right: 10px; + white-space: nowrap; + z-index: 1; +} + #wikitree { list-style-type: none; } @@ -34,7 +71,7 @@ body.dragging, body.dragging * { cursor: default; color: transparent; } -#wikitree .branch, #wikitree .action, #wikilist .action, .expandAll, .collapseAll, .gotoSelected { +#wikitree .branch, #wikitree .action, #wikitree .sortable-handle, #wikilist .action, .expandAll, .collapseAll, .gotoSelected { appearance: none; -webkit-appearance: none; outline: none; @@ -46,6 +83,11 @@ body.dragging, body.dragging * { position: relative; z-index: 2; } +#wikitree .sortable-handle, .actionBigger { + font-size: 1.2em !important; + padding-right: 5px !important; + padding-left: 5px !important; +} #wikitree li, #wikilist li { line-height: normal !important; } @@ -58,26 +100,3 @@ body.dragging, body.dragging * { #wikitree button a .fa, #wikilist button a .fa { color: var(--link-color-primary); } - -.wikilink { - padding-top: 3px; - padding-bottom: 3px; - padding-left: 10px; - padding-right: 10px; - white-space: nowrap; - z-index: 1; -} - -.wikipage { - padding-bottom: 5px; - padding-top: 5px; - text-align: left; - white-space: nowrap; -} -.wikipage.dragElem { - opacity: 0.4; -} -.wikipage.over { - border: 2px dashed #000; - border-top: 2px solid blue; -} diff --git a/Asset/vendor/jquery-sortable/jquery-sortable.js b/Asset/vendor/jquery-sortable/jquery-sortable.js index 8390b45..181fd30 100644 --- a/Asset/vendor/jquery-sortable/jquery-sortable.js +++ b/Asset/vendor/jquery-sortable/jquery-sortable.js @@ -1,6 +1,6 @@ /* =================================================== * jquery-sortable.js v0.9.13 - * http://johnny.github.com/jquery-sortable/ + * https://github.com/johnny/jquery-sortable * =================================================== * Copyright (c) 2012 Jonas von Andrian * All rights reserved. @@ -86,6 +86,8 @@ // The Placeholder has not been moved yet. onDrag: function ($item, position, _super, event) { $item.css(position) + event.preventDefault() + event.stopPropagation() }, // Called after the drag has been started, // that is the mouse button is being held down and @@ -110,6 +112,7 @@ onMousedown: function ($item, _super, event) { if (!event.target.nodeName.match(/^(input|select|textarea)$/i)) { event.preventDefault() + event.stopPropagation() return true } }, @@ -266,7 +269,7 @@ if(!this.dragging){ if(!this.distanceMet(e) || !this.delayMet) return - + this.options.onDragStart(this.item, this.itemContainer, groupDefaults.onDragStart, e) this.item.before(this.placeholder) this.dragging = true @@ -401,10 +404,11 @@ ) >= this.options.distance) }, getPointer: function(e) { - var o = e.originalEvent || e.originalEvent.touches && e.originalEvent.touches[0] + var o = e.originalEvent, + t = (e.originalEvent.touches && e.originalEvent.touches[0]) || {} return { - left: e.pageX || o.pageX, - top: e.pageY || o.pageY + left: e.pageX || o.pageX || t.pageX, + top: e.pageY || o.pageY || t.pageY } }, setupDelayTimer: function () { @@ -465,7 +469,6 @@ var itemPath = this.rootGroup.options.itemPath this.target = itemPath ? this.el.find(itemPath) : this.el - this.target.on(eventNames.start, this.handle, $.proxy(this.dragInit, this)) if(this.options.drop) @@ -495,7 +498,7 @@ rootGroup = this.rootGroup, validTarget = !rootGroup.options.isValidTarget || rootGroup.options.isValidTarget(rootGroup.item, this) - + if(!i && validTarget){ rootGroup.movePlaceholder(this, this.target, "append") return true diff --git a/Helper/WikiHelper.php b/Helper/WikiHelper.php index 3145eab..d102e4c 100644 --- a/Helper/WikiHelper.php +++ b/Helper/WikiHelper.php @@ -53,41 +53,41 @@ public function js($filepath, $async = false) */ public function renderChildren($children, $parent_id, $project, $selected_wiki_id, $not_editable) { $html = '
                        '; - foreach ($children as $item) { - $is_active = ($selected_wiki_id == $item['id']) ? ' active' : ''; - $has_children = isset($item['children']) && (count($item['children']) > 0); - $html .= '
                      • '; - if(!$not_editable) { - $html .= '
                        '; - $html .= ''; - $html .= ''; - $html .= '
                        '; - } - if($has_children){ - $html .= ''; - $wikipage_icon = 'folder-o'; - } else { - $html .= ''; - $wikipage_icon = 'file-word-o'; - } - $html .= ''; - if(!$not_editable) { - $html .= $this->helper->url->icon( - $wikipage_icon, t($item['title']), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $item['id']), false, 'wikilink'.$is_active - ); - } else { - $html .= $this->helper->url->icon( - $wikipage_icon, t($item['title']), 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $item['id']), false, 'wikilink'.$is_active - ); - } - if($has_children) { + if (isset($children) && (count($children) > 0)) { + foreach ($children as $item) { + $is_active = ($selected_wiki_id == $item['id']) ? ' active' : ''; + $has_children = isset($item['children']) && (count($item['children']) > 0); + $html .= '
                      • '; + if(!$not_editable) { + $html .= '
                        '; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= '
                        '; + } + if($has_children){ + $html .= ''; + $wikipage_icon = 'folder-o'; + } else { + $html .= ''; + $wikipage_icon = 'file-word-o'; + } + if (!$not_editable) { + $html .= $this->helper->url->icon( + $wikipage_icon, $item['title'], 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $item['id']), false, 'wikilink' . $is_active + ); + } else { + $html .= $this->helper->url->icon( + $wikipage_icon, $item['title'], 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $item['id']), false, 'wikilink' . $is_active + ); + } $html .= $this->renderChildren($item['children'], $item['id'], $project, $selected_wiki_id, $not_editable); + $html .= '
                        • '; } - $html .= ''; } $html .= '
                      '; return $html; diff --git a/Template/wiki/sidebar.php b/Template/wiki/sidebar.php index 885229d..6b369d8 100755 --- a/Template/wiki/sidebar.php +++ b/Template/wiki/sidebar.php @@ -17,15 +17,18 @@

                      - - - + + +
                      +
                        data-reorder-url="url->href('WikiAjaxController', 'reorder_by_index', array('plugin' => 'wiki', 'project_id' => $project['id'], 'csrf_token' => $this->app->getToken()->getReusableCSRFToken())) ?>"> +
                      • wikiHelper->renderChildren($wikipages, 0, $project, $wiki_id, $not_editable)?> +
                        From 815741d3834b768b4a2fc6b75549b18526e74a5e Mon Sep 17 00:00:00 2001 From: "Im[F(x)]" Date: Sat, 2 Nov 2024 10:16:25 +0200 Subject: [PATCH 27/50] * hover highlight for the branch rows in wikitree * added a fictive `(root)` branch to wikitree for better visual and dragging experience * the default wiki view and clicking on `(root)` now show a fully expanded standalone wikitree view --- Asset/Javascript/wiki.js | 19 +++++---- Asset/css/wiki.css | 23 ++++++---- Controller/WikiController.php | 79 +++++++++++++++++++---------------- Helper/WikiHelper.php | 4 +- Template/wiki/sidebar.php | 37 +++++++++++----- 5 files changed, 98 insertions(+), 64 deletions(-) diff --git a/Asset/Javascript/wiki.js b/Asset/Javascript/wiki.js index 456548a..e3bc835 100644 --- a/Asset/Javascript/wiki.js +++ b/Asset/Javascript/wiki.js @@ -53,8 +53,8 @@ jQuery(document).ready(function () { function gotoSelectedWikipageBranch() { function expandParentWikipage(el) { const parentUl = el.parent(); - const parentId = parentUl.attr("data-parent-id"); - if (parentId == 0) return; // end recursion + const parentId = parentUl.attr("id"); + if (parentId === "wikiroot") return; // end recursion const parentWikipage = parentUl.parent(); const button = parentWikipage.find(".branch a i")[0]; @@ -65,8 +65,9 @@ jQuery(document).ready(function () { expandParentWikipage(parentWikipage); } - const selected = $("#wikitree").find(".wikipage.active"); + const selected = $("#wikiroot").find(".wikipage.active"); expandParentWikipage(selected); + $("#wikiroot").show(); } $('.expandAll').click(function () { @@ -98,25 +99,29 @@ jQuery(document).ready(function () { } }); - collapseAllWikipagesBranches(); - gotoSelectedWikipageBranch(); + // if not root selected, then collapse entire wiki content except for the selected branch + if ($("#wikitree").length == 1 && $("#wikitree").data("selected-wiki-id") != 0) { + collapseAllWikipagesBranches(); + gotoSelectedWikipageBranch(); + } } //-------------------------------------- // page reorder and nesting support using jquery sorting plugin //-------------------------------------- - if($("#wikitree").length == 1 && $("#wikitree").data("reorder-url")) { + if($("#wikiroot").length == 1 && $("#wikitree").length == 1 && $("#wikitree").data("reorder-url")) { if (isMobile) { $(".sortable-handle").show(); } $('#wikitree').sortable({ + $('#wikiroot').sortable({ nested: true, itemSelector: ".wikipage", placeholder: '
                      • ', placeholderClass: "sortable-placeholder", draggedClass: "sortable-dragged", - handle: isMobile ? ".sortable-handle" : ".wikilink", + handle: isMobile ? ".sortable-handle" : ".wikibranch", onDrop: function ($item, container, _super) { // console.log("onDrop", $item, container, _super) container.el.removeClass("active"); diff --git a/Asset/css/wiki.css b/Asset/css/wiki.css index 7e26e00..a80151c 100644 --- a/Asset/css/wiki.css +++ b/Asset/css/wiki.css @@ -5,7 +5,7 @@ body.dragging, body.dragging * { .sortable-dragged { position: absolute; opacity: 0.75; - background: rgba(255, 250, 144, 0.15); + background: rgba(255, 250, 144, 0.25); z-index: 2000 !important; } @@ -37,7 +37,7 @@ body.dragging, body.dragging * { height: 100%; resize: horizontal; overflow: auto; - max-width: 50% !important; + max-width: 75% !important; min-width: 384px !important; } @@ -46,6 +46,16 @@ body.dragging, body.dragging * { padding-top: 5px; text-align: left; white-space: nowrap; + line-height: normal !important; +} + +.wikibranch { + width: calc(100% - 24px); + display: inline-block; +} +.wikibranch:hover { + cursor: move; + background: rgba(255, 250, 144, 0.25); } .wikilink { @@ -56,6 +66,9 @@ body.dragging, body.dragging * { white-space: nowrap; z-index: 1; } +.wikilink.active { + box-shadow: 0 0 10px #777777 inset; +} #wikitree { list-style-type: none; @@ -88,15 +101,9 @@ body.dragging, body.dragging * { padding-right: 5px !important; padding-left: 5px !important; } -#wikitree li, #wikilist li { - line-height: normal !important; -} #wikitree li:last-child, #wikilist li:last-child { margin-bottom: 0px !important; } -#wikitree .wikilink.active { - box-shadow: 0 0 10px #777777 inset; -} #wikitree button a .fa, #wikilist button a .fa { color: var(--link-color-primary); } diff --git a/Controller/WikiController.php b/Controller/WikiController.php index cc8721d..7969f11 100755 --- a/Controller/WikiController.php +++ b/Controller/WikiController.php @@ -158,19 +158,28 @@ public function detail_readonly() { $result = $this->prepareWikipagesTree($wikipages, $wiki_id); $wikipage_sublist = $this->helper->wikiHelper->generateIndentedChildren($result['tree'], false, $wiki_id, 0, -1); - // use a wiki helper for better side bar TODO: - $this->response->html($this->helper->layout->app('wiki:wiki/detail', array( - 'project' => $project, - 'title' => $project['name'], - 'wiki_id' => $result['selected']['id'], - 'wiki' => $result['selected'], - 'not_editable' => true, - 'files' => $this->wikiFileModel->getAllDocuments($wiki_id), - 'images' => $this->wikiFileModel->getAllImages($wiki_id), - 'wikipages' => $result['tree'], - 'wikipage' => $result['selected'], - 'wikipage_sublist' => $wikipage_sublist, - ))); + if ($wiki_id != 0) { + $this->response->html($this->helper->layout->app('wiki:wiki/detail', array( + 'project' => $project, + 'title' => $project['name'], + 'wiki_id' => $result['selected']['id'], + 'wiki' => $result['selected'], + 'not_editable' => true, + 'files' => $this->wikiFileModel->getAllDocuments($wiki_id), + 'images' => $this->wikiFileModel->getAllImages($wiki_id), + 'wikipages' => $result['tree'], + 'wikipage' => $result['selected'], + 'wikipage_sublist' => $wikipage_sublist, + ))); + } else { + $this->response->html($this->helper->layout->app('wiki:wiki/sidebar', array( + 'project' => $project, + 'title' => $project['name'], + 'wiki_id' => $wiki_id, + 'wikipages' => $result['tree'], + 'not_editable' => true, + ))); + } } /** @@ -186,30 +195,26 @@ public function detail() $result = $this->prepareWikipagesTree($wikipages, $wiki_id); $wikipage_sublist = $this->helper->wikiHelper->generateIndentedChildren($result['tree'], false, $wiki_id, 0, -1); - // use a wiki helper for better side bar TODO: - $this->response->html($this->helper->layout->app('wiki:wiki/detail', array( - 'project' => $project, - 'title' => $project['name'], - 'wiki_id' => $result['selected']['id'], - 'wiki' => $result['selected'], - 'files' => $this->wikiFileModel->getAllDocuments($wiki_id), - 'images' => $this->wikiFileModel->getAllImages($wiki_id), - 'wikipages' => $result['tree'], - 'wikipage' => $result['selected'], - 'wikipage_sublist' => $wikipage_sublist, - ))); - - // $wikipage= $wikipages->select(1)->eq('id', $wiki_id)->findOne(); - - // $wikipage= $wikipages->eq('id', $wiki_id); - - // $this->response->html($this->helper->layout->app('wiki:wiki/detail', array( - // 'project' => $project, - // 'title' => $project['name'], - // 'wiki_id' => $wiki_id, - // 'wikipage' => $wikipage, - // 'wikipages' => $wikipages, - // ))); + if ($wiki_id != 0) { + $this->response->html($this->helper->layout->app('wiki:wiki/detail', array( + 'project' => $project, + 'title' => $project['name'], + 'wiki_id' => $result['selected']['id'], + 'wiki' => $result['selected'], + 'files' => $this->wikiFileModel->getAllDocuments($wiki_id), + 'images' => $this->wikiFileModel->getAllImages($wiki_id), + 'wikipages' => $result['tree'], + 'wikipage' => $result['selected'], + 'wikipage_sublist' => $wikipage_sublist, + ))); + } else { + $this->response->html($this->helper->layout->app('wiki:wiki/sidebar', array( + 'project' => $project, + 'title' => $project['name'], + 'wiki_id' => $wiki_id, + 'wikipages' => $result['tree'], + ))); + } } // public function breakdown() diff --git a/Helper/WikiHelper.php b/Helper/WikiHelper.php index d102e4c..02a91fe 100644 --- a/Helper/WikiHelper.php +++ b/Helper/WikiHelper.php @@ -52,7 +52,7 @@ public function js($filepath, $async = false) * @return string */ public function renderChildren($children, $parent_id, $project, $selected_wiki_id, $not_editable) { - $html = '
                          '; + $html = ''; if (isset($children) && (count($children) > 0)) { foreach ($children as $item) { $is_active = ($selected_wiki_id == $item['id']) ? ' active' : ''; @@ -76,6 +76,7 @@ public function renderChildren($children, $parent_id, $project, $selected_wiki_i $html .= ''; $wikipage_icon = 'file-word-o'; } + $html .= ''; if (!$not_editable) { $html .= $this->helper->url->icon( $wikipage_icon, $item['title'], 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $item['id']), false, 'wikilink' . $is_active @@ -85,6 +86,7 @@ public function renderChildren($children, $parent_id, $project, $selected_wiki_i $wikipage_icon, $item['title'], 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'token' => $project['token'], 'wiki_id' => $item['id']), false, 'wikilink' . $is_active ); } + $html .= ''; $html .= $this->renderChildren($item['children'], $item['id'], $project, $selected_wiki_id, $not_editable); $html .= ''; } diff --git a/Template/wiki/sidebar.php b/Template/wiki/sidebar.php index 6b369d8..67e0165 100755 --- a/Template/wiki/sidebar.php +++ b/Template/wiki/sidebar.php @@ -1,4 +1,13 @@ -
                          + + + + projectHeader->render($project, 'TaskListController', 'show') ?> + + +
                          wikiHelper->js("plugins/Wiki/Asset/vendor/jquery-sortable/jquery-sortable.js")?> @@ -25,17 +34,23 @@
                          -
                            data-reorder-url="url->href('WikiAjaxController', 'reorder_by_index', array('plugin' => 'wiki', 'project_id' => $project['id'], 'csrf_token' => $this->app->getToken()->getReusableCSRFToken())) ?>"> -
                          • -wikiHelper->renderChildren($wikipages, 0, $project, $wiki_id, $not_editable)?> -
                            • -
                          - -
                            -
                          • - +
                              data-reorder-url="url->href('WikiAjaxController', 'reorder_by_index', array('plugin' => 'wiki', 'project_id' => $project['id'], 'csrf_token' => $this->app->getToken()->getReusableCSRFToken())) ?>"> +
                            • + + + helper->url->icon('home', t('(root)'), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => 0), false, 'wikilink'.$is_active)?> + + helper->url->icon('home', t('(root)'), 'WikiController', 'detail_readonly', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => 0), false, 'wikilink'.$is_active)?> + + wikiHelper->renderChildren($wikipages, 0, $project, $wiki_id, $not_editable)?>
                              • -
                            +
                          + +
                            +
                          • + +
                            • +
                          From f66895fc074811be50b3b05b372d560f58fed5af Mon Sep 17 00:00:00 2001 From: "Im[F(x)]" Date: Sat, 2 Nov 2024 11:56:17 +0200 Subject: [PATCH 28/50] * fixed obtaining `getWikiPagesByParentId` in WikiModel * fixed `updatepage` and `createpage` in WikiModel to force a `ordercolumn = GetLastOrderPosition() + 1` when moving a page from one parent to another --- Model/WikiModel.php | 89 +++++++++++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 35 deletions(-) diff --git a/Model/WikiModel.php b/Model/WikiModel.php index 0cc5efe..372cde5 100755 --- a/Model/WikiModel.php +++ b/Model/WikiModel.php @@ -44,7 +44,7 @@ public function getEditions($wiki_id) */ const WIKITABLE = 'wikipage'; - /** + /** * Events * * @var string @@ -61,37 +61,35 @@ public function getEditions($wiki_id) * @return mixed */ function getWikiPagesByParentId($project_id, $parent_id){ - if(isset ($parent_id)){ + if (isset($parent_id)) { return $this->db - ->table(self::WIKITABLE) - ->columns( - 'c.name as creator_name', - 'c.username as creator_username', - 'mod.name as modifier_name', - 'mod.username as modifier_username', - self::WIKITABLE . '.id', - self::WIKITABLE . '.title', - self::WIKITABLE . '.parent_id', - self::WIKITABLE . '.content', - self::WIKITABLE . '.project_id', - self::WIKITABLE . '.is_active', - self::WIKITABLE . '.ordercolumn', - self::WIKITABLE . '.creator_id', - self::WIKITABLE . '.date_creation', - self::WIKITABLE . '.date_modification', - self::WIKITABLE . '.editions', - self::WIKITABLE . '.current_edition', - self::WIKITABLE . '.modifier_id' - ) - ->left(UserModel::TABLE, 'c', 'id', self::WIKITABLE, 'creator_id') - ->left(UserModel::TABLE, 'mod', 'id', self::WIKITABLE, 'modifier_id') - ->eq('project_id', $project_id) - ->eq('parent_id', $parent_id) - ->asc('parent_id') - ->asc('ordercolumn') - ->findAll(); - } - else { + ->table(self::WIKITABLE) + ->columns( + 'c.name as creator_name', + 'c.username as creator_username', + 'mod.name as modifier_name', + 'mod.username as modifier_username', + self::WIKITABLE . '.id', + self::WIKITABLE . '.title', + self::WIKITABLE . '.parent_id', + self::WIKITABLE . '.content', + self::WIKITABLE . '.project_id', + self::WIKITABLE . '.is_active', + self::WIKITABLE . '.ordercolumn', + self::WIKITABLE . '.creator_id', + self::WIKITABLE . '.date_creation', + self::WIKITABLE . '.date_modification', + self::WIKITABLE . '.editions', + self::WIKITABLE . '.current_edition', + self::WIKITABLE . '.modifier_id' + ) + ->left(UserModel::TABLE, 'c', 'id', self::WIKITABLE, 'creator_id') + ->left(UserModel::TABLE, 'mod', 'id', self::WIKITABLE, 'modifier_id') + ->eq('project_id', $project_id) + ->eq('parent_id', $parent_id) + ->asc('ordercolumn') + ->findAll(); + } else { return $this->db ->table(self::WIKITABLE) ->columns( @@ -117,11 +115,11 @@ function getWikiPagesByParentId($project_id, $parent_id){ ->left(UserModel::TABLE, 'mod', 'id', self::WIKITABLE, 'modifier_id') ->eq('project_id', $project_id) ->isNull('parent_id') - ->asc('parent_id') ->asc('ordercolumn') ->findAll(); } } + /** * Get all Wiki Pages by order for a project * @@ -277,6 +275,7 @@ public function reorderPages($project_id, $src_wiki_id, $target_wiki_id){ return true; } + /** * update page position and parent id * @param mixed $wiki_id @@ -290,7 +289,7 @@ public function savePagePosition($wiki_id, $orderColumn, $parent_id) { 'parent_id' => $parent_id )); - if (! $result) { + if (!$result) { $this->db->cancelTransaction(); return false; } @@ -401,6 +400,20 @@ public function getWiki() return $wikipage; } + private function getLastOrderPosition($project_id) + { + $lastPosition = $this->db->table(self::WIKITABLE) + ->eq('project_id', $project_id) + ->desc('ordercolumn') + ->findOneColumn('ordercolumn'); + + if (empty($lastPosition)) { + $lastPosition = 0; + } + + return $lastPosition; + } + /** * Add a new wikipage into the database * @@ -432,6 +445,12 @@ public function updatepage($paramvalues, $editions, $date = '') $values['parent_id'] = null; } + // if parent changes, then force change the ordercolumn + $wikipage = $this->getWikipage($paramvalues['id']); + if ($wikipage['parent_id'] != $values['parent_id']) { + $values['ordercolumn'] = $this->getLastOrderPosition($wikipage['project_id']) + 1; + } + if ($this->userSession->isLogged()) { $values['modifier_id'] = $this->userSession->getId(); } @@ -466,7 +485,7 @@ public function createpage($project_id, $title, $content, $date = '', $order = n 'title' => $title, 'content' => $content, 'date_creation' => $date ?: date('Y-m-d'), - 'ordercolumn' => $order ?: time(), + 'ordercolumn' => $this->getLastOrderPosition($project_id) + 1, ); $this->prepare($values); @@ -611,6 +630,7 @@ public function removepage($wiki_id) $wikiEventJob->executeWithId($wiki_id, self::EVENT_DELETE); return $this->db->table(self::WIKITABLE)->eq('id', $wiki_id)->remove(); } + /** * restore a specific edition * @@ -643,6 +663,5 @@ public function restoreEdition($wiki_id, $edition) // return $this->db->table(self::WIKITABLE)->eq('id', $wiki_id)->remove(); return $this->db->table(self::WIKITABLE)->eq('id', $wiki_id)->update($values); - } } From cb1c80500b737a0973c6a1d5a64f815123f9fa6e Mon Sep 17 00:00:00 2001 From: "Im[F(x)]" Date: Sat, 2 Nov 2024 22:30:43 +0200 Subject: [PATCH 29/50] * a total rework of `reorderPagesByIndex` and `reorderPages` methods in WikiModel, in order to correctly handle all reordering cases, a bit of optimization and code simplification * unit test touched appropriately * finally a fully and correctly functioning reordering of wikitree sortable by drag & drop, taking care to reload the page to refresh changes in the hierarchy of the wiki pages --- Asset/Javascript/wiki.js | 45 +++++---- Controller/WikiAjaxController.php | 11 +-- Model/WikiModel.php | 148 ++++++++++++++++-------------- Test/Model/WikiModelTest.php | 4 +- 4 files changed, 106 insertions(+), 102 deletions(-) diff --git a/Asset/Javascript/wiki.js b/Asset/Javascript/wiki.js index e3bc835..1f6a9ea 100644 --- a/Asset/Javascript/wiki.js +++ b/Asset/Javascript/wiki.js @@ -114,7 +114,6 @@ jQuery(document).ready(function () { $(".sortable-handle").show(); } - $('#wikitree').sortable({ $('#wikiroot').sortable({ nested: true, itemSelector: ".wikipage", @@ -123,45 +122,43 @@ jQuery(document).ready(function () { draggedClass: "sortable-dragged", handle: isMobile ? ".sortable-handle" : ".wikibranch", onDrop: function ($item, container, _super) { - // console.log("onDrop", $item, container, _super) - container.el.removeClass("active"); - var srcProperties = { - ...$item[0].dataset - } - var containerProperties = {...container.el[0].dataset} - - let request = { - "src_wiki_id": srcProperties["pageId"], - "index": $item.index(), - "parent_id": containerProperties["parentId"] - } + // console.log("onDrop", $item, container, _super) - // console.log("request", request) + const itemProperties = { ...$item[0].dataset } + const containerProperties = { ...container.el[0].dataset } + // console.log(itemProperties) + // console.log(containerProperties) + const request = { + "src_wiki_id": itemProperties["pageId"], + "index": $item.index() + 1, + "parent_id": containerProperties["parentId"], + } + // console.log("request", request) - $.ajax({ + $.ajax({ cache: false, url: $("#wikitree").data("reorder-url"), contentType: "application/json", type: "POST", processData: false, data: JSON.stringify(request), - success: function(data) { - // self.refresh(data); - // self.savingInProgress = false; + success: function(/*data*/) { + // alert(data); + location.reload(); }, - error: function() { - // self.app.hideLoadingIcon(); - // self.savingInProgress = false; + error: function(xhr,textStatus,e) { + alert(xhr.responseText); + location.reload(); }, statusCode: { 403: function(data) { - window.alert(data.responseJSON.message); - document.location.reload(true); + alert(data.responseJSON.message); + location.reload(); } } }); - _super($item, container); + _super($item, container); }, }); } diff --git a/Controller/WikiAjaxController.php b/Controller/WikiAjaxController.php index f494fde..ab6299d 100644 --- a/Controller/WikiAjaxController.php +++ b/Controller/WikiAjaxController.php @@ -24,7 +24,7 @@ public function reorder_by_index(){ $this->checkReusableGETCSRFParam(); $project_id = $this->request->getIntegerParam('project_id'); - if (! $project_id || ! $this->request->isAjax()) { + if (!$project_id || !$this->request->isAjax()) { throw new AccessForbiddenException(); } @@ -35,7 +35,8 @@ public function reorder_by_index(){ } try { - $result = $this->wikiModel->reorderPagesByIndex($project_id, $values['src_wiki_id'], $values['index'], $values['parent_id'] ?? null); + $parent_id = (isset($values['parent_id']) && $values['parent_id'] != '' && $values['parent_id'] != '0') ? $values['parent_id'] : null; + $result = $this->wikiModel->reorderPagesByIndex($project_id, $values['src_wiki_id'], $values['index'], $parent_id); if (!$result) { $this->response->status(400); @@ -55,7 +56,7 @@ public function reorder() $this->checkReusableGETCSRFParam(); $project_id = $this->request->getIntegerParam('project_id'); - if (! $project_id || ! $this->request->isAjax()) { + if (!$project_id || !$this->request->isAjax()) { throw new AccessForbiddenException(); } @@ -65,10 +66,6 @@ public function reorder() throw new AccessForbiddenException(); } - // if (! $this->helper->projectRole->canMoveTask($project_id, $values['src_column_id'], $values['dst_column_id'])) { - // throw new AccessForbiddenException(e("You don't have the permission to move this task")); - // } - try { $result = $this->wikiModel->reorderPages($project_id, $values['src_wiki_id'], $values['target_wiki_id']); diff --git a/Model/WikiModel.php b/Model/WikiModel.php index 372cde5..5d97158 100755 --- a/Model/WikiModel.php +++ b/Model/WikiModel.php @@ -55,7 +55,7 @@ public function getEditions($wiki_id) /** - * retrieve wikipages by parent id + * retrieve wiki pages by parent id * @param mixed $project_id * @param mixed $parent_id * @return mixed @@ -170,40 +170,51 @@ public function getWikipages($project_id) } public function reorderPagesByIndex($project_id, $src_wiki_id, $index, $parent_id){ - // retrieve wiki pages + // echo "project_id: " . $project_id . " src_wiki_id: " . $src_wiki_id . " index: " . $index . " parent_id: " . $parent_id . "
                          " . PHP_EOL; + + // retrieve src wiki page and wiki pages by parent + $wikiPageSrc = $this->getWikipage($src_wiki_id); $wikiPages = $this->getWikiPagesByParentId($project_id, $parent_id); + // echo "count list: " . count($wikiPages) . "
                          " . PHP_EOL; + // print_r($wikiPages); - // echo json_encode($wikiPages), true; + // if the new parent list is empty add src_wiki_id as first subpage + if (empty($wikiPages)) { + // echo "updating wikipage ". $src_wiki_id ." column to ". $orderColumn . " for parent " . $parent_id . "
                          " . PHP_EOL; + return $this->savePagePosition($src_wiki_id, 1, $parent_id); + } - // echo "project_id: " . $project_id . " src_wiki_id: " . $src_wiki_id . " index: " . - $index . " parent_id: " . $parent_id ." count list: " . count($wikiPages) . "
                          "; - // change order of each in for loop, move matching id to one before target - $orderColumn = 0; - $oldSourceColumn = 1; - $oldParentId = 0; - // disable save if list is empty - if(empty($wikiPages)){ - return false; + // determine what needs to change + $orderColumn = 1; + $changeIndex = 0; + $oldIndex = $wikiPageSrc['ordercolumn']; + $changeParent = ($parent_id != $wikiPageSrc['parent_id']); + if ($changeParent || $index < $oldIndex) { + $changeIndex = 1; + } + if (!$changeParent && $index > $oldIndex) { + $changeIndex = -1; + } + if (!$changeParent && $changeIndex == 0) { + return true; // nothing changes !!! } - for ($i=0; $i < count($wikiPages); $i++) { - $oldOrderColumn = $wikiPages[$i]['ordercolumn']; - $id = $wikiPages[$i]['id']; - // increment by 1 if index matches - if($orderColumn == $index && $id != $src_wiki_id){ - // add additional order column - $orderColumn++; - } - // echo " id: " . $id . " oldOrderColumn: " . $oldOrderColumn . " orderColumn: " . $orderColumn . "
                          "; - if ($id == $src_wiki_id) { - $oldSourceColumn = $oldOrderColumn; - $oldParentId = $wikiPages[$i]['parent_id']; - } else { - if ($oldOrderColumn != $orderColumn) { - // echo "updating ". $id ." column to ". $orderColumn . "
                          "; - $result = $this->savePagePosition($id, $orderColumn, $wikiPages[$i]['parent_id'] ?? null); - if(!$result){ - // echo "Error: ". $id ." column not updated to ". $orderColumn . "
                          "; + // shift the order of affected subpages in the target parent + foreach ($wikiPages as $wikipage) { + $id = $wikipage['id']; + // echo "id: " . $id . " oldIndex: " . $oldIndex . " index: " . $index . " => orderColumn: " . $orderColumn . "
                          " . PHP_EOL; + if ($id != $src_wiki_id) { + if ($changeIndex > 0 && $orderColumn == $index) { + $orderColumn++; + } + if ($changeIndex < 0 && $orderColumn - 1 == $oldIndex) { + $orderColumn--; + $changeIndex = 1; + } + + if ($orderColumn != $wikipage['ordercolumn']) { + // echo "updating " . $id . " column to " . $orderColumn . " for parent " . ($wikipage['parent_id'] ?? null) . "
                          " . PHP_EOL; + if(!$this->savePagePosition($id, $orderColumn, $wikipage['parent_id'] ?? null)) { return false; } } @@ -212,63 +223,62 @@ public function reorderPagesByIndex($project_id, $src_wiki_id, $index, $parent_i } // update moved src - // echo "oldSourceColumn: " . $oldSourceColumn . " index: " . $index . "
                          "; - if($oldSourceColumn != $index || $oldParentId != $parent_id){ - // echo "updating src ". $src_wiki_id . " column to ". $targetColumn -1 . "
                          "; - $result = $this->savePagePosition($src_wiki_id, $index, $parent_id ?? null); - if(!$result){ - // echo "Error: ". $src_wiki_id ." column not updated to ". $index . "
                          "; - return false; - } - } - - return true; + // echo "updating src " . $src_wiki_id . " column to " . $index . "
                          " . PHP_EOL; + return $this->savePagePosition($src_wiki_id, $index, $parent_id ?? null); } public function reorderPages($project_id, $src_wiki_id, $target_wiki_id){ - // retrieve wiki pages - $wikiPages = $this->getWikipages($project_id); + // echo "project_id: " . $project_id . " src_wiki_id: " . $src_wiki_id . " target_wiki_id: " . $target_wiki_id . "
                          " . PHP_EOL; - // echo json_encode($wikiPages), true; + // retrieve src/trg wiki pages + $wikiPageSrc = $this->getWikipage($src_wiki_id); + $wikiPageTrg = $this->getWikipage($target_wiki_id); - // echo "project_id: " . $project_id . " src_wiki_id: " . $src_wiki_id . " target_wiki_id: " . $target_wiki_id . "
                          "; - // change order of each in for loop, move matching id to one before target - $orderColumn = 1; - $targetColumn = 1; - $oldSourceColumn = 1; - $oldParentId = 0; - for ($i=0; $i < count($wikiPages); $i++) { - $oldOrderColumn = $wikiPages[$i]['ordercolumn']; - $id = $wikiPages[$i]['id']; + // ensure both wiki pages are under the same parent + if ($wikiPageSrc['parent_id'] != $wikiPageTrg['parent_id']) { + return false; + } + + // retrieve wiki pages by parent + $wikiPages = $this->getWikiPagesByParentId($project_id, $wikiPageSrc['parent_id']); + // echo "count list: " . count($wikiPages) . "
                          " . PHP_EOL; + // print_r($wikiPages); + + $orderColumn = 0; + $targetColumn = 0; + $oldColumn = $wikiPageSrc['ordercolumn']; + // shift the order of affected subpages + foreach ($wikiPages as $wikipage) { + $orderColumn++; + $id = $wikipage['id']; if($id == $target_wiki_id){ - // add additional order column + if ($orderColumn != $wikipage['ordercolumn']) { + // echo "updating " . $id . " column to " . $orderColumn . "
                          " . PHP_EOL; + if(!$this->savePagePosition($id, $orderColumn, $wikiPageSrc['parent_id'] ?? null)) { + return false; + } + } $orderColumn++; $targetColumn = $orderColumn; } - // echo " id: " . $id . " oldOrderColumn: " . $oldOrderColumn . " orderColumn: " . $orderColumn . "
                          "; - + // echo "id: " . $id . " oldColumn: " . $oldColumn . " orderColumn: " . $orderColumn . " => targetColumn: " . $targetColumn . "
                          " . PHP_EOL; if ($id == $src_wiki_id) { - $oldSourceColumn = $oldOrderColumn; - $oldParentId = $wikiPages[$i]['parent_id']; + $orderColumn--; + $targetColumn--; } else { - if ($oldOrderColumn != $orderColumn) { - // echo "updating ". $id ." column to ". $orderColumn . "
                          "; - $result = $this->savePagePosition($id, $orderColumn, $wikiPages[$i]['parent_id']); - if(!$result){ + if ($orderColumn != $wikipage['ordercolumn']) { + // echo "updating " . $id . " column to " . $orderColumn . "
                          " . PHP_EOL; + if(!$this->savePagePosition($id, $orderColumn, $wikiPageSrc['parent_id'] ?? null)) { return false; } } } - $orderColumn++; } // update moved src - $targetColumn--; - // echo "oldSourceColumn: " . $oldSourceColumn . " targetColumn: " . $targetColumn . "
                          "; - if($oldSourceColumn != $targetColumn){ - // echo "updating src ". $src_wiki_id . " column to ". $targetColumn -1 . "
                          "; - $result = $this->savePagePosition($src_wiki_id, $targetColumn, $oldParentId); - if(!$result){ + if ($oldColumn != $targetColumn) { + // echo "updating src " . $src_wiki_id . " column to " . $targetColumn . "
                          " . PHP_EOL; + if(!$this->savePagePosition($src_wiki_id, $targetColumn, $wikiPageSrc['parent_id'])) { return false; } } diff --git a/Test/Model/WikiModelTest.php b/Test/Model/WikiModelTest.php index 8ee92e9..df9e3ae 100644 --- a/Test/Model/WikiModelTest.php +++ b/Test/Model/WikiModelTest.php @@ -89,7 +89,7 @@ public function testReOrder(){ // reorder $wikimodel->reorderPages($project['id'], 5, 3); // expected by id - $expectedColumnOrders = [1,2,4,5,3]; + $expectedColumnOrders = [1,2,5,3,4]; $wikiPages = $wikimodel->getWikipages($project['id']); $this->assertEquals(count($expectedColumnOrders), count($wikiPages), 'expected column order count doesn\'t match pages'); @@ -128,7 +128,7 @@ public function testReOrderByIndex(){ // reorder $wikimodel->reorderPagesByIndex($project['id'], 4, 2, null); // expected by id - $expectedColumnOrders = [0,1,3,2]; + $expectedColumnOrders = [1,4,2,3]; $wikiPages = $wikimodel->getWikiPagesByParentId($project['id'], null); $this->assertEquals(count($expectedColumnOrders), count($wikiPages), 'expected column order count doesn\'t match pages'); From 80f85b0fd331b92799006315855344aaad910130 Mon Sep 17 00:00:00 2001 From: "Im[F(x)]" Date: Sun, 3 Nov 2024 01:00:47 +0200 Subject: [PATCH 30/50] * implemented purging of wiki editions * checking for actual changes when creating editions * fixed routes for restore/purge editions * reworked restore/purge buttons for editions * adjusted indent of lines for the wikitree --- Asset/Javascript/wiki.js | 3 ++ Asset/css/wiki.css | 4 +- Controller/WikiController.php | 49 ++++++++++++++++--- Helper/WikiHelper.php | 6 +-- Model/WikiModel.php | 87 +++++++++++++++++++++++---------- Plugin.php | 3 +- Template/wiki/confirm_purge.php | 8 +++ Template/wiki/editions.php | 12 ++++- Template/wiki/sidebar.php | 4 +- 9 files changed, 132 insertions(+), 44 deletions(-) create mode 100644 Template/wiki/confirm_purge.php diff --git a/Asset/Javascript/wiki.js b/Asset/Javascript/wiki.js index 1f6a9ea..e5a4431 100644 --- a/Asset/Javascript/wiki.js +++ b/Asset/Javascript/wiki.js @@ -23,6 +23,9 @@ jQuery(document).ready(function () { $("#wikilist").find(".action a").each(function () { $(this).attr('title', $(this).parent().attr('title')); }); + $("#wikiedition").find(".action a").each(function () { + $(this).attr('title', $(this).parent().attr('title')); + }); //-------------------------------------- // handle collapse/expand of wikitree branches diff --git a/Asset/css/wiki.css b/Asset/css/wiki.css index a80151c..e08db38 100644 --- a/Asset/css/wiki.css +++ b/Asset/css/wiki.css @@ -84,7 +84,7 @@ body.dragging, body.dragging * { cursor: default; color: transparent; } -#wikitree .branch, #wikitree .action, #wikitree .sortable-handle, #wikilist .action, .expandAll, .collapseAll, .gotoSelected { +#wikitree .branch, #wikitree .action, #wikitree .sortable-handle, #wikilist .action, #wikiedition .action, .expandAll, .collapseAll, .gotoSelected { appearance: none; -webkit-appearance: none; outline: none; @@ -104,6 +104,6 @@ body.dragging, body.dragging * { #wikitree li:last-child, #wikilist li:last-child { margin-bottom: 0px !important; } -#wikitree button a .fa, #wikilist button a .fa { +#wikitree button a .fa, #wikilist button a .fa, #wikiedition button a .fa { color: var(--link-color-primary); } diff --git a/Controller/WikiController.php b/Controller/WikiController.php index 7969f11..f5486bb 100755 --- a/Controller/WikiController.php +++ b/Controller/WikiController.php @@ -295,30 +295,47 @@ public function confirm() } /** - * Remove a wikipage + * Restore a wikipage edition * * @access public */ public function restore() { - // $this->checkCSRFParam(); $project = $this->getProject(); if ($this->wikiModel->restoreEdition($this->request->getIntegerParam('wiki_id'), $this->request->getIntegerParam('edition'))) { $this->flash->success(t('Edition was restored successfully.')); $this->response->redirect($this->helper->url->to('WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $this->request->getIntegerParam('wiki_id'))), true); - // $this->url->link(t($page['title']), 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $page['id'])) - } else { $this->flash->failure(t('Unable to restore this wiki edition.')); $this->response->redirect($this->helper->url->to('WikiController', 'editions', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $this->request->getIntegerParam('wiki_id'))), true); - } - // redirect to detail - // $this->response->redirect($this->helper->url->to('WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $this->request->getIntegerParam('wiki_id'))), true); + } + /** + * Purge a wikipage edition + * + * @access public + */ + public function purge() + { + $project = $this->getProject(); + $wiki_id = $this->request->getIntegerParam('wiki_id'); + $edition = $this->request->getIntegerParam('edition'); - // $this->response->redirect($this->helper->url->to('WikiController', 'editions', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $this->request->getIntegerParam('wiki_id'))), true); + $wikipage = $this->wikiModel->getWikipage($wiki_id); + if ($wikipage['current_edition'] == $edition) { + $this->flash->failure(t('Your current wiki edition cannot be purged.')); + $this->response->redirect($this->helper->url->to('WikiController', 'editions', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $this->request->getIntegerParam('wiki_id'))), true); + return; + } + + if ($this->wikiModel->purgeEdition($wiki_id, $edition)) { + $this->flash->success(t('Edition was purged successfully.')); + } else { + $this->flash->failure(t('Unable to purge this wiki edition.')); + } + $this->response->redirect($this->helper->url->to('WikiController', 'editions', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $this->request->getIntegerParam('wiki_id'))), true); } /** @@ -337,6 +354,22 @@ public function confirm_restore() ))); } + /** + * Confirmation dialog before purging an edition + * + * @access public + */ + public function confirm_purge() + { + $project = $this->getProject(); + + $this->response->html($this->template->render('wiki:wiki/confirm_purge', array( + 'project' => $project, + 'wiki_id' => $this->request->getIntegerParam('wiki_id'), + 'edition' => $this->request->getIntegerParam('edition'), + ))); + } + /** * Validate and save a new wikipage * diff --git a/Helper/WikiHelper.php b/Helper/WikiHelper.php index 02a91fe..6055087 100644 --- a/Helper/WikiHelper.php +++ b/Helper/WikiHelper.php @@ -51,7 +51,7 @@ public function js($filepath, $async = false) * @param mixed $not_editable * @return string */ - public function renderChildren($children, $parent_id, $project, $selected_wiki_id, $not_editable) { + public function renderChildren($children, $parent_id, $project, $selected_wiki_id, $not_editable, $indent = 0) { $html = ''; if (isset($children) && (count($children) > 0)) { foreach ($children as $item) { @@ -76,7 +76,7 @@ public function renderChildren($children, $parent_id, $project, $selected_wiki_i $html .= ''; $wikipage_icon = 'file-word-o'; } - $html .= ''; + $html .= '' . str_repeat(' ', 2 * $indent); if (!$not_editable) { $html .= $this->helper->url->icon( $wikipage_icon, $item['title'], 'WikiController', 'detail', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $item['id']), false, 'wikilink' . $is_active @@ -87,7 +87,7 @@ public function renderChildren($children, $parent_id, $project, $selected_wiki_i ); } $html .= ''; - $html .= $this->renderChildren($item['children'], $item['id'], $project, $selected_wiki_id, $not_editable); + $html .= $this->renderChildren($item['children'], $item['id'], $project, $selected_wiki_id, $not_editable, $indent + 1); $html .= ''; } } diff --git a/Model/WikiModel.php b/Model/WikiModel.php index 5d97158..7fbfa76 100755 --- a/Model/WikiModel.php +++ b/Model/WikiModel.php @@ -26,10 +26,10 @@ class WikiModel extends Base const WIKI_EDITION_TABLE = 'wikipage_editions'; /** - * Get all of a Wikipages'edition by edition + * Get all of Wikipages' editions by edition * * @access public - * @param integer $project_id + * @param integer $wiki_id * @return array */ public function getEditions($wiki_id) @@ -37,6 +37,18 @@ public function getEditions($wiki_id) return $this->db->table(self::WIKI_EDITION_TABLE)->eq('wikipage_id', $wiki_id)->desc('edition')->findAll(); } + /** + * Get latest of Wikipages' editions + * + * @access public + * @param integer $wiki_id + * @return array + */ + public function getLatestEdition($wiki_id) + { + return $this->db->table(self::WIKI_EDITION_TABLE)->eq('wikipage_id', $wiki_id)->desc('edition')->findOne(); + } + /** * SQL table name * @@ -526,32 +538,40 @@ public function createpage($project_id, $title, $content, $date = '', $order = n // , $date = '' public function createEdition($values, $wiki_id, $edition, $date='') { - $persistEditions = $this->configModel->get('persistEditions'); + if ($persistEditions != 1) { + return null; // early exit + } - if ($persistEditions == 1) { + $latestEdition = $this->getLatestEdition($wiki_id); + $isEditionChanged = empty($latestEdition); // if no previous editions + if (!$isEditionChanged) { + // check if there are any meaningful changes (e.g. changing parent is NOT meaningful for editions) + $isEditionChanged |= ($values['title'] != $latestEdition['title']); + $isEditionChanged |= ($values['content'] != $latestEdition['content']); + } + if (!$isEditionChanged) { + return null; // no changes !!! + } - $editionvalues = array( - 'title' => $values['title'], - 'edition' => $edition, - 'content' => $values['content'], - 'date_creation' => $date ?: date('Y-m-d'), // should alway be the last date - // 'creator_id' => $this->userSession->getId(), - 'wikipage_id' => $wiki_id, - ); + $editionvalues = array( + 'title' => $values['title'], + 'edition' => $edition, + 'content' => $values['content'], + 'date_creation' => $date ?: date('Y-m-d'), // should always be the last date + // 'creator_id' => $this->userSession->getId(), + 'wikipage_id' => $wiki_id, + ); - if ($this->userSession->isLogged()) { - $editionvalues['creator_id'] = $this->userSession->getId(); - } + if ($this->userSession->isLogged()) { + $editionvalues['creator_id'] = $this->userSession->getId(); + } - // $values['creator_id'] = $this->userSession->getId(); - // $values['modifier_id'] = $this->userSession->getId(); - // date_modification + // $values['creator_id'] = $this->userSession->getId(); + // $values['modifier_id'] = $this->userSession->getId(); + // date_modification - return $this->db->table(self::EDITIONTABLE)->persist($editionvalues); - } else { - return null; - } + return $this->db->table(self::EDITIONTABLE)->persist($editionvalues); // need to also save to editions } @@ -651,12 +671,10 @@ public function removepage($wiki_id) */ public function restoreEdition($wiki_id, $edition) { - $date = date('Y-m-d'); - $editionvalues = $this->db-> - table(self::WIKI_EDITION_TABLE) - ->eq('edition', $edition) + $editionvalues = $this->db->table(self::WIKI_EDITION_TABLE) ->eq('wikipage_id', $wiki_id) + ->eq('edition', $edition) ->findOne(); // this may possibly not support joins $values = [ @@ -671,7 +689,22 @@ public function restoreEdition($wiki_id, $edition) $values['modifier_id'] = $this->userSession->getId(); } - // return $this->db->table(self::WIKITABLE)->eq('id', $wiki_id)->remove(); return $this->db->table(self::WIKITABLE)->eq('id', $wiki_id)->update($values); } + + /** + * purge a specific edition + * + * @access public + * @param integer $wiki_id + * @param integer $edition + * @return boolean + */ + public function purgeEdition($wiki_id, $edition) + { + return $this->db->table(self::WIKI_EDITION_TABLE) + ->eq('wikipage_id', $wiki_id) + ->eq('edition', $edition) + ->remove(); + } } diff --git a/Plugin.php b/Plugin.php index 80e1a06..8a5914e 100755 --- a/Plugin.php +++ b/Plugin.php @@ -28,7 +28,8 @@ public function initialize() $this->route->addRoute('/wiki/project/:project_id/create', 'WikiController', 'create', 'wiki'); $this->route->addRoute('/wiki/edit/:wiki_id', 'WikiController', 'edit', 'wiki'); $this->route->addRoute('/wiki/project/:project_id/remove/:wiki_id', 'WikiController', 'confirm', 'wiki'); - $this->route->addRoute('/wiki/project/:project_id/restore/:wiki_id', 'WikiController', 'confirm_restore', 'wiki'); + $this->route->addRoute('/wiki/project/:project_id/restore/:wiki_id/:edition', 'WikiController', 'confirm_restore', 'wiki'); + $this->route->addRoute('/wiki/project/:project_id/purge/:wiki_id/:edition', 'WikiController', 'confirm_purge', 'wiki'); // page routes wiki files $this->route->addRoute('/wiki/file/:project_id/create/:wiki_id', 'WikiFileController', 'create', 'wiki'); diff --git a/Template/wiki/confirm_purge.php b/Template/wiki/confirm_purge.php new file mode 100644 index 0000000..0b35f91 --- /dev/null +++ b/Template/wiki/confirm_purge.php @@ -0,0 +1,8 @@ +
                          +

                          +
                          + +
                          +

                          + modal->confirmButtons('WikiController', 'purge', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wiki_id, 'edition' => $edition)) ?> +
                          diff --git a/Template/wiki/editions.php b/Template/wiki/editions.php index 3109545..784e0ae 100755 --- a/Template/wiki/editions.php +++ b/Template/wiki/editions.php @@ -26,11 +26,19 @@ +

                          - modal->confirm('history', '', 'WikiController', 'confirm_restore', array('plugin' => 'wiki', 'project_id' => $project['id'], 'wiki_id' => $wiki_id, 'edition' => $edition['edition']))?> +
                          + + +

                          @@ -45,8 +53,10 @@

                          +
                          +