commit

Author: degami

app/site/controllers/Admin/Pages.php

@@ -115,6 +115,15 @@ public function getFormDefinition(FAPI\Form $form, &$form_state)
                     $templates[$key] = basename($template);
                 }
 
+                if (($theme_name = $this->getSiteData()->getThemeName($page->getWebsiteId())) != null) {
+                    $theme_dir = App::getDir(App::TEMPLATES).DS.'frontend'.DS.$theme_name.DS;
+                    foreach (glob($theme_dir.'pages'.DS.'*.php') as $template) {
+                        $key = str_replace($theme_dir, "", $template);
+                        $key = preg_replace("/\.php$/i", "", $key);
+                        $templates[$key] = basename($template)." (".$theme_name.")";
+                    }
+                }
+
                 $page_title = $page_content = $page_template_name = '';
                 if ($page->isLoaded()) {
                     $page_title = $page->title;

app/site/migrations/InitialDataMigration.php

@@ -218,7 +218,7 @@ private function addVariables($website_model, $homePage)
             'app/frontend/menu_with_logo' => ['locale' => null, 'value' => 1],
             'app/backend/log_requests' => ['locale' => null, 'value' => 1],
             'app/frontend/log_requests' => ['locale' => null, 'value' => 1],
-            'app/frontend/themename' => ['locale' => $website_model->default_locale, 'value' => 'theme'],
+            'app/frontend/themename' => ['locale' => null, 'value' => 'theme'],
         ] as $path => $info) {
             $configuration_model = \App\Site\Models\Configuration::new($this->getContainer());
             $configuration_model->website_id = $website_model->id;