Add blueprints support for modular content

system/src/Grav/Common/Page/Page.php

@@ -643,7 +643,7 @@ class Page
             $this->template = $var;
         }
         if (empty($this->template)) {
-            $this->template = str_replace(CONTENT_EXT, '', $this->name());
+            $this->template = ($this->modular() ? 'modular/' : '') . str_replace(CONTENT_EXT, '', $this->name());
         }
         return $this->template;
     }

system/src/Grav/Common/Page/Pages.php

@@ -343,7 +343,19 @@ class Pages
     {
         $types = self::getTypes();
 
-        return $types->toSelect();
+        return $types->pageSelect();
+    }
+
+    /**
+     * Get available page types.
+     *
+     * @return array
+     */
+    static public function modularTypes()
+    {
+        $types = self::getTypes();
+
+        return $types->modularSelect();
     }
 
     /**

system/src/Grav/Common/Page/Types.php

@@ -29,9 +29,8 @@ class Types implements \ArrayAccess, \Iterator, \Countable
             'filters' => [
                 'key' => '|\.yaml$|'
                 ],
-            'key' => 'Filename',
+            'key' => 'SubPathName',
             'value' => 'PathName',
-            'recursive' => false
         ];
 
         $this->items = Folder::all($path, $options) + $this->items;
@@ -52,15 +51,36 @@ class Types implements \ArrayAccess, \Iterator, \Countable
         foreach (Folder::all($path, $options) as $type) {
             $this->register($type);
         }
+        if (file_exists($path . 'modular/')) {
+            foreach (Folder::all($path . 'modular/', $options) as $type) {
+                $this->register($type);
+            }
+        }
     }
 
-    public function toSelect()
+    public function pageSelect()
     {
         $list = [];
         foreach ($this->items as $name => $file) {
+            if (strstr($name, '/')) {
+                continue;
+            }
             $list[$name] = ucfirst(strtr($name, '_', ' '));
         }
         ksort($list);
         return $list;
     }
+
+    public function modularSelect()
+    {
+        $list = [];
+        foreach ($this->items as $name => $file) {
+            if (strstr($name, 'modular/') !== 0) {
+                continue;
+            }
+            $list[$name] = trim(ucfirst(strtr($name, '_', ' ')));
+        }
+        ksort($list);
+        return $list;
+    }
 }