Use onGetPageTemplates-event in Admin

OleVik · May 9, 2020 · b9d141a · b9d141a
1 parent c59214b
commit b9d141a
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v1.0.4
+## 09-05-2020
+
+1. [](#bugfix)
+    * Use onGetPageTemplates-event in Admin
+    * README-link
+
 # v1.0.3
 ## 20-02-2020
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Scholar
-version: 1.0.3
+version: 1.0.4
 description: An academic-focused theme, for publishing papers, articles, books, documentation, your blog, and even your resumé. Features include high accessibility, fast performance, print-friendly styles and more.
 icon: book
 author:
@@ -9,7 +9,7 @@ homepage: https://github.com/OleVik/grav-theme-scholar
 demo: https://olevik.me/staging/grav-skeleton-scholar
 keywords: grav, theme, academic, paper, papers, article, articles, book, books, docs, documentation, resume, cv
 bugs: https://github.com/OleVik/grav-theme-scholar/issues
-readme: https://github.com/OleVik/grav-theme-scholar/blob/develop/README.md
+readme: https://github.com/OleVik/grav-theme-scholar/blob/master/README.md
 license: MIT
 dependencies:
   - { name: grav, version: "~1.6.21" }

diff --git a/scholar.php b/scholar.php
@@ -77,7 +77,8 @@ public function onThemeInitialized()
         if ($this->isAdmin() && $this->config->get('plugins.admin')) {
             $this->enable(
                 [
-                    'onGetPageBlueprints' => ['onGetPageBlueprints', 0]
+                    'onGetPageBlueprints' => ['onGetPageBlueprints', 0],
+                    'onGetPageTemplates' => ['onGetPageTemplates', 0]
                 ]
             );
         }
@@ -226,7 +227,7 @@ public function onGetPageBlueprints(Event $event)
             );
             if ($componentFolder) {
                 $folder = $this->grav['locator']->findResource(
-                    $componentFolder,
+                    'theme://components/' . $component,
                     true,
                     true
                 );
@@ -237,6 +238,27 @@ public function onGetPageBlueprints(Event $event)
         }
     }
 
+    /**
+     * Register Page blueprints
+     *
+     * @param Event $event Instance of RocketTheme\Toolbox\Event\Event.
+     *
+     * @return void
+     */
+    public function onGetPageTemplates(Event $event)
+    {
+        foreach ($this->config->get('themes.scholar.components') as $component) {
+            $folder = $this->grav['locator']->findResource(
+                'theme://components/' . $component,
+                true,
+                true
+            );
+            if (is_dir($folder)) {
+                $event->types->scanTemplates($folder);
+            }
+        }
+    }
+
     /**
      * Handle API
      *