Add config option to show data on the top of the page (#550)

* Add config option to show data on the top of the page

Currently the default behavior is to show the data below the first
heading if it is found, or else on the top of the page.
In addition to the existing option to always show the data on the
bottom, let's also add an option to show it always on the top.

As we want to stay compatible with existing setups that use the
'bottomoutput' option we add another boolean 'topoutput'. The former
takes precedence over the latter and only if both are unset, the
default behavior of showing the data below the first heading is used.

Signed-off-by: Frieder Schrempf <dev@fris.de>

* fixup! Add config option to show data on the top of the page

Author: fschrempf

action/output.php

@@ -47,11 +47,12 @@ public function handleOutput(Doku_Event $event, $param)
         if (!page_exists($ID)) return;
 
         $pos = 0;
+        $ins = -1;
+
         // display struct data at the bottom?
         if ($this->getConf('bottomoutput')) {
             $ins = count($event->data->calls);
-        } else {
-            $ins = -1;
+        } else if (!$this->getConf('topoutput')) {
             foreach ($event->data->calls as $num => $call) {
                 // try to find the first header
                 if ($call[0] == 'header') {

conf/default.php

@@ -1,4 +1,5 @@
 <?php
 
 $conf['bottomoutput'] = 0;
+$conf['topoutput'] = 0;
 $conf['disableDeleteSerial'] = 0;

conf/metadata.php

@@ -1,4 +1,5 @@
 <?php
 
 $meta['bottomoutput'] = ['onoff'];
+$meta['topoutput'] = ['onoff'];
 $meta['disableDeleteSerial'] = ['onoff'];

lang/de/settings.php

@@ -5,4 +5,5 @@
  *
  */
 $lang['bottomoutput']          = 'Daten am Ende der Seite anzeigen';
+$lang['topoutput']             = 'Daten am Anfang der Seite anzeigen';
 $lang['disableDeleteSerial']   = 'Löschen von serial Daten deaktivieren';

lang/en/settings.php

@@ -1,3 +1,4 @@
 <?php
 $lang['bottomoutput'] = 'Display data at the bottom of the page';
+$lang['topoutput'] = 'Display data at the top of the page';
 $lang['disableDeleteSerial']   = 'Disable delete button for serial data';

lang/fr/settings.php

@@ -10,3 +10,4 @@
  * @author Laynee <seedfloyd@gmail.com>
  */
 $lang['bottomoutput']          = 'Afficher les données au bas de la page';
+$lang['topoutput']             = 'Afficher les données en haut de la page';