Merge branch 'hotfix/dokuwiki-css-class' into develop

giterlizzi · Jul 16, 2019 · 2dfb657 · 2dfb657
2 parents d13926e + 8ec4a29
commit 2dfb657
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -56,6 +56,7 @@ Enjoy!
   * Fixed "PHP Notice" for `MAX_FILE_SIZE`
   * Fixed Bootswatch Theme selection behavior
   * Fixed navbar "Edit button" behavior
+  * Fixed issue with Plugins and userstyle.css (added `div.dokuwiki` tag and class in `main.php` and `detail.php`)
   * #421: Fixed "showIndividualTool" issue (thanks to @AmritasyaPutra)
   * #422: Fixed graphic incompatibility for Folded plugin (thanks to @virk)
   * #423: Fixed PHP warnings for Page Tools (thanks to @fschmittlein)

diff --git a/detail.php b/detail.php
@@ -295,7 +295,7 @@
 </script>
 </head>
 
-<body class="<?php echo $TEMPLATE->getClasses() ?>" data-img-id="<?php echo $IMG ?>">
+<body class="<?php echo $TEMPLATE->getClasses() ?>" data-img-id="<?php echo $IMG ?>"><div class="dokuwiki"><?php /* CSS class for Plugins and user styles */ ?>
 
     <header id="dokuwiki__header" class="dw-container dokuwiki container<?php echo ($TEMPLATE->isFluidContainer()) ? '-fluid' : '' ?>">
         <?php
@@ -315,7 +315,9 @@
         ?>
     </header>
 
-    <main role="main" id="dokuwiki__top" class="dw-container pb-5 dokuwiki container<?php echo ($TEMPLATE->isFluidContainer()) ? '-fluid mx-5' : '' ?>">
+    <a name="dokuwiki__top" id="dokuwiki__top"></a>
+
+    <main role="main" class="dw-container pb-5 dokuwiki container<?php echo ($TEMPLATE->isFluidContainer()) ? '-fluid mx-5' : '' ?>">
 
         <div id="dokuwiki__pageheader">
 
@@ -341,7 +343,7 @@
 
                 <?php require_once('tpl/page-tools.php'); // Page Tools ?>
 
-                <div class="<?php echo ($TEMPLATE->getConf('pageOnPanel') ? 'panel panel-default px-3 py-2' : 'no-panel') ?>">
+                <div class="dokuwiki <?php echo ($TEMPLATE->getConf('pageOnPanel') ? 'panel panel-default px-3 py-2' : 'no-panel') ?>">
                     <div class="page <?php echo ($TEMPLATE->getConf('pageOnPanel') ? 'panel-body' : '') ?>">
 
                         <?php require_once(template('tpl/page-icons.php')); ?>
@@ -531,5 +533,7 @@
         <span class="visible-lg-block"></span>
     </div>
 
+</div>
+
 </body>
 </html>
diff --git a/main.php b/main.php
@@ -32,7 +32,7 @@
     <![endif]-->
 </head>
 <?php tpl_flush() ?>
-<body class="<?php echo $TEMPLATE->getClasses() ?>" data-page-id="<?php echo $ID ?>">
+<body class="<?php echo $TEMPLATE->getClasses() ?>" data-page-id="<?php echo $ID ?>"><div class="dokuwiki"><?php /* CSS class for Plugins and user styles */ ?>
 
     <header id="dokuwiki__header" class="dw-container dokuwiki container<?php echo ($TEMPLATE->isFluidContainer()) ? '-fluid mx-5' : '' ?>">
     <?php
@@ -52,7 +52,9 @@
     ?>
     </header>
 
-    <main role="main" id="dokuwiki__top" class="dw-container pb-5 dokuwiki container<?php echo ($TEMPLATE->isFluidContainer()) ? '-fluid mx-5' : '' ?>">
+    <a name="dokuwiki__top" id="dokuwiki__top"></a>
+
+    <main role="main" class="dw-container pb-5 dokuwiki container<?php echo ($TEMPLATE->isFluidContainer()) ? '-fluid mx-5' : '' ?>">
 
         <div id="dokuwiki__pageheader">
 
@@ -197,5 +199,7 @@
         tpl_indexerWebBug();
     ?>
 
+</div>
+
 </body>
 </html>