[BUGFIX] Fixed the ModuleTemplate template paths for all backend modu…

…les, added condition for tx_yoastseo_related_focuskeyword to not include auto generated columns in 13
Yoast · Sep 26, 2024 · ba07cc3 · ba07cc3
1 parent 9833842
commit ba07cc3
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 53 deletions.
diff --git a/Classes/Controller/AbstractBackendController.php b/Classes/Controller/AbstractBackendController.php
@@ -22,7 +22,7 @@ abstract class AbstractBackendController extends ActionController
     /**
      * @param array<string, mixed> $data
      */
-    protected function returnResponse(array $data = [], ModuleTemplate $moduleTemplate = null): ResponseInterface
+    protected function returnResponse(string $template, array $data = [], ModuleTemplate $moduleTemplate = null): ResponseInterface
     {
         $data['layout'] = GeneralUtility::makeInstance(Typo3Version::class)
             ->getMajorVersion() < 13 ? 'Default' : 'Module';
@@ -39,7 +39,7 @@ protected function returnResponse(array $data = [], ModuleTemplate $moduleTempla
         $moduleTemplate->getDocHeaderComponent()->setMetaInformation($this->getPageInformation());
 
         $moduleTemplate->assignMultiple($data);
-        return $moduleTemplate->renderResponse();
+        return $moduleTemplate->renderResponse($template);
     }
 
     protected function getModuleTemplate(): ModuleTemplate

diff --git a/Classes/Controller/CrawlerController.php b/Classes/Controller/CrawlerController.php
@@ -23,7 +23,7 @@ public function __construct(
     public function indexAction(): ResponseInterface
     {
         $this->addYoastJavascriptConfig();
-        return $this->returnResponse(['sites' => $this->siteFinder->getAllSites()]);
+        return $this->returnResponse('Crawler/Index', ['sites' => $this->siteFinder->getAllSites()]);
     }
 
     public function resetProgressAction(int $site, int $language):? ResponseInterface

diff --git a/Classes/Controller/DashboardController.php b/Classes/Controller/DashboardController.php
@@ -10,6 +10,6 @@ class DashboardController extends AbstractBackendController
 {
     public function indexAction(): ResponseInterface
     {
-        return $this->returnResponse();
+        return $this->returnResponse('Dashboard/Index');
     }
 }
diff --git a/Classes/Controller/OverviewController.php b/Classes/Controller/OverviewController.php
@@ -34,7 +34,7 @@ public function listAction(int $currentPage = 1): ResponseInterface
         $overviewData = $this->getOverviewData($currentPage) + ['action' => 'list'];
         $moduleTemplate = $this->getModuleTemplate();
         if (!isset($overviewData['pageInformation'])) {
-            return $this->returnResponse($overviewData, $moduleTemplate);
+            return $this->returnResponse('Overview/List', $overviewData, $moduleTemplate);
         }
 
         $moduleTemplate->getDocHeaderComponent()->setMetaInformation($overviewData['pageInformation']);
@@ -47,7 +47,7 @@ public function listAction(int $currentPage = 1): ResponseInterface
             $moduleTemplate->getDocHeaderComponent()->getMenuRegistry()->addMenu($languageMenu);
         }
 
-        return $this->returnResponse($overviewData, $moduleTemplate);
+        return $this->returnResponse('Overview/List', $overviewData, $moduleTemplate);
     }
 
     /**

diff --git a/Configuration/TCA/tx_yoastseo_related_focuskeyword.php b/Configuration/TCA/tx_yoastseo_related_focuskeyword.php
@@ -1,8 +1,11 @@
 <?php
 
+use TYPO3\CMS\Core\Information\Typo3Version;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
 $llPrefix = 'LLL:EXT:yoast_seo/Resources/Private/Language/TCA.xlf:';
 
-return [
+$focusKeywordTca = [
     'ctrl' => [
         'title' => $llPrefix . 'tx_yoastseo_related_focuskeyword.title',
         'label' => 'keyword',
@@ -25,16 +28,6 @@
         ],
     ],
     'columns' => [
-        'sys_language_uid' => $GLOBALS['TCA']['tt_content']['columns']['sys_language_uid'],
-        'l10n_parent' => array_replace_recursive($GLOBALS['TCA']['tt_content']['columns']['l18n_parent'], [
-            'config' => [
-                'foreign_table' => 'tx_yoastseo_related_focuskeyword',
-                'foreign_table_where' => 'AND tx_yoastseo_related_focuskeyword.pid=###CURRENT_PID### AND tx_yoastseo_related_focuskeyword.sys_language_uid IN (-1,0)',
-            ]
-        ]),
-        'l10n_source' => $GLOBALS['TCA']['tt_content']['columns']['l10n_source'],
-        'l10n_diffsource' => $GLOBALS['TCA']['tt_content']['columns']['l18n_diffsource'],
-        'hidden' => $GLOBALS['TCA']['tt_content']['columns']['hidden'],
         'keyword' => [
             'exclude' => 1,
             'l10n_mode' => 'prefixLangTitle',
@@ -92,3 +85,23 @@
         ]
     ],
 ];
+
+if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
+    $focusKeywordTca['columns'] = array_merge(
+        $focusKeywordTca['columns'],
+        [
+            'sys_language_uid' => $GLOBALS['TCA']['tt_content']['columns']['sys_language_uid'],
+            'l10n_parent' => array_replace_recursive($GLOBALS['TCA']['tt_content']['columns']['l18n_parent'], [
+                'config' => [
+                    'foreign_table' => 'tx_yoastseo_related_focuskeyword',
+                    'foreign_table_where' => 'AND tx_yoastseo_related_focuskeyword.pid=###CURRENT_PID### AND tx_yoastseo_related_focuskeyword.sys_language_uid IN (-1,0)',
+                ]
+            ]),
+            'l10n_source' => $GLOBALS['TCA']['tt_content']['columns']['l10n_source'],
+            'l10n_diffsource' => $GLOBALS['TCA']['tt_content']['columns']['l18n_diffsource'],
+            'hidden' => $GLOBALS['TCA']['tt_content']['columns']['hidden'],
+        ]
+    );
+}
+
+return $focusKeywordTca;
diff --git a/Configuration/page.tsconfig b/Configuration/page.tsconfig
@@ -0,0 +1,3 @@
+templates.yoast-seo-for-typo3/yoast_seo {
+    10 = yoast-seo-for-typo3/yoast_seo:Resources/Private
+}
diff --git a/Resources/Private/Templates/Dashboard/Legacy.html b/Resources/Private/Templates/Dashboard/Legacy.html
diff --git a/Resources/Private/Templates/Overview/Legacy.html b/Resources/Private/Templates/Overview/Legacy.html
diff --git a/Resources/Private/Templates/Widget/OrphanedContentWidget.html b/Resources/Private/Templates/Widget/OrphanedContentWidget.html
@@ -7,7 +7,7 @@
 
 <f:section name="main">
     <div class="widget-table-wrapper">
-        <table class="widget-table">
+        <table class="widget-table table table-striped table-hover">
             <tr>
                 <th><f:translate key="LLL:EXT:yoast_seo/Resources/Private/Language/BackendModule.xlf:page" /></th>
                 <th><f:translate key="LLL:EXT:yoast_seo/Resources/Private/Language/BackendModule.xlf:lastChange" /></th>

diff --git a/Resources/Private/Templates/Widget/PageWithoutMetaDescriptionWidget.html b/Resources/Private/Templates/Widget/PageWithoutMetaDescriptionWidget.html
@@ -7,7 +7,7 @@
 
 <f:section name="main">
     <div class="widget-table-wrapper">
-        <table class="widget-table">
+        <table class="widget-table table table-striped table-hover">
             <tr>
                 <th><f:translate key="LLL:EXT:yoast_seo/Resources/Private/Language/BackendModule.xlf:page" /></th>
                 <th><f:translate key="LLL:EXT:yoast_seo/Resources/Private/Language/BackendModule.xlf:lastChange" /></th>