Fixes #1 by allowing 'new' buttons to always be accessible

SoarinFerret · Sep 15, 2020 · 9bf7f34 · 9bf7f34
1 parent 19fa8d7
commit 9bf7f34
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 11 deletions.
diff --git a/action.php b/action.php
@@ -89,7 +89,7 @@ public function addNewPageButton(Doku_Event $event) {
             $event->data['view'] !== 'page'
             || $this->getConf('hideNewPage')
             || !page_exists($ID)
-            || !(substr_compare($ID, ":start", -strlen(":start")) === 0)
+            || ($this->getConf('onlyShowNewButtonsOnStart') && !(substr_compare($ID, ":start", -strlen(":start")) === 0))
         ) {
             return;
         }
@@ -111,7 +111,7 @@ public function addNewFolderButton(Doku_Event $event) {
             $event->data['view'] !== 'page'
             || $this->getConf('hideNewFolder')
             || !page_exists($ID)
-            || !(substr_compare($ID, ":start", -strlen(":start")) === 0)
+            || ($this->getConf('onlyShowNewButtonsOnStart') && !(substr_compare($ID, ":start", -strlen(":start")) === 0))
         ) {
             return;
         }

diff --git a/conf/default.php b/conf/default.php
@@ -7,4 +7,5 @@
 $conf['hideDelete']     = 0;
 $conf['hideNewPage']    = 0;
 $conf['hideNewFolder']  = 0;
-$conf['usePrompt']      = 0;
+$conf['usePrompt']      = 0;
+$conf['onlyShowNewButtonsOnStart'] = 0;
diff --git a/conf/metadata.php b/conf/metadata.php
@@ -7,4 +7,5 @@
 $meta['hideDelete']     = array('onoff');
 $meta['hideNewPage']    = array('onoff');
 $meta['hideNewFolder']  = array('onoff');
-$meta['usePrompt']      = array('onoff');
+$meta['usePrompt']      = array('onoff');
+$meta['onlyShowNewButtonsOnStart'] = array('onoff');
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,8 +5,8 @@ services:
   dokuwiki:
     environment:
       - DOKUWIKI_PASSWORD=password
-    image: bitnami/dokuwiki:latest
+    image: bitnami/dokuwiki:20200729
     ports:
-      - "8080:80"
+      - "8080:8080"
     volumes:
-      - $PWD:/bitnami/dokuwiki/lib/plugins/pagebuttons
+      - $PWD:/pagebuttons
diff --git a/lang/en/settings.php b/lang/en/settings.php
@@ -7,4 +7,5 @@
 $lang['hideDelete']     = 'Disable the delete button';
 $lang['hideNewPage']    = 'Disable the New Page button';
 $lang['hideNewFolder']  = 'Disable the New Folder button';
-$lang['usePrompt']      = 'Use JS Prompt method instead of modal - some themes do not properly implement modals';
+$lang['usePrompt']      = 'Use JS Prompt method instead of modal - some themes do not properly implement modals';
+$lang['onlyShowNewButtonsOnStart'] = 'Only show the new page and new folder buttons on :start pages';
diff --git a/plugin.info.txt b/plugin.info.txt
@@ -1,7 +1,7 @@
 base   pagebuttons
 author Cody Ernesti
 email  [email protected]
-date   2020-06-11
+date   2020-09-14
 name   Page Buttons plugin
 desc   Adds a PageMenu button to Delete the current page, add a subpage, and add a subfolder
 url    https://www.dokuwiki.org/plugin:pagebuttons
diff --git a/script.js b/script.js
@@ -73,7 +73,7 @@ jQuery(function() {
     jQuery('.newfolderbutton a').click(function(f) {
         f.preventDefault();
 
-        var pre_url = window.location.href.substring(0, window.location.href.indexOf(JSINFO['id'])) + JSINFO['id'].replace(":start","");
+        var pre_url = window.location.href.substring(0, window.location.href.indexOf(JSINFO['id'])) + JSINFO['namespace'];
 
         if(usePrompt){
             var page = window.prompt(LANG.plugins.pagebuttons.newfolder_prompt);
@@ -128,7 +128,7 @@ jQuery(function() {
     jQuery('.newpagebutton a').click(function(p) {
         p.preventDefault();
 
-        var pre_url = window.location.href.substring(0, window.location.href.indexOf(JSINFO['id'])) + JSINFO['id'].replace(":start","");
+        var pre_url = window.location.href.substring(0, window.location.href.indexOf(JSINFO['id'])) + JSINFO['namespace'];
 
         if(usePrompt){
             var page = window.prompt(LANG.plugins.pagebuttons.newpage_prompt);