From 179675e1f442cf75babe7a921bc874cc714b0ec6 Mon Sep 17 00:00:00 2001
From: Francois Suter <francois@typo3.org>
Date: Fri, 27 Dec 2013 16:47:01 +0100
Subject: [PATCH] [TASK] Use speaking keys for new menu types
The new menu "categories-based tt_content menu" uses a "speaking" key
for its type. The same should be applied to the other new menu type
introduced in TYPO3 CMS 6.2 (i.e. categories-based page menu).
Resolves: #54611
Releases: 6.2
Change-Id: I489a528050dcfeef83c1919155a3b11e599b195c
Reviewed-on: https://review.typo3.org/26566
Reviewed-by: Markus Klein
Reviewed-by: Wouter Wolters
Reviewed-by: Michiel Roos
Reviewed-by: Francois Suter
Tested-by: Francois Suter
---
typo3/sysext/cms/locallang_ttc.xlf | 2 +-
typo3/sysext/core/Classes/Category/CategoryRegistry.php | 2 +-
typo3/sysext/css_styled_content/static/setup.txt | 6 +++---
typo3/sysext/css_styled_content/static/v4.5/setup.txt | 6 +++---
typo3/sysext/css_styled_content/static/v4.6/setup.txt | 6 +++---
typo3/sysext/css_styled_content/static/v4.7/setup.txt | 6 +++---
typo3/sysext/css_styled_content/static/v6.0/setup.txt | 6 +++---
typo3/sysext/css_styled_content/static/v6.1/setup.txt | 6 +++---
typo3/sysext/frontend/Configuration/TCA/tt_content.php | 4 ++--
9 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/typo3/sysext/cms/locallang_ttc.xlf b/typo3/sysext/cms/locallang_ttc.xlf
index e087da3f7c14..33676d21d354 100644
--- a/typo3/sysext/cms/locallang_ttc.xlf
+++ b/typo3/sysext/cms/locallang_ttc.xlf
@@ -450,7 +450,7 @@
<trans-unit id="menu_type.I.8" xml:space="preserve">
<source>Sitemaps of selected pages</source>
</trans-unit>
- <trans-unit id="menu_type.I.9" xml:space="preserve">
+ <trans-unit id="menu_type.I.categorized_pages" xml:space="preserve">
<source>Pages for selected categories</source>
</trans-unit>
<trans-unit id="menu_type.I.categorized_content" xml:space="preserve">
diff --git a/typo3/sysext/core/Classes/Category/CategoryRegistry.php b/typo3/sysext/core/Classes/Category/CategoryRegistry.php
index 12b48e074071..df23603b1d87 100644
--- a/typo3/sysext/core/Classes/Category/CategoryRegistry.php
+++ b/typo3/sysext/core/Classes/Category/CategoryRegistry.php
@@ -143,7 +143,7 @@ class CategoryRegistry implements \TYPO3\CMS\Core\SingletonInterface {
public function getCategoryFieldsForTable(array &$configuration, \TYPO3\CMS\Backend\Form\FormEngine $formObject) {
$table = '';
// Define the table being looked up from the type of menu
- if ($configuration['row']['menu_type'] == 9) {
+ if ($configuration['row']['menu_type'] == 'categorized_pages') {
$table = 'pages';
} elseif ($configuration['row']['menu_type'] == 'categorized_content') {
$table = 'tt_content';
diff --git a/typo3/sysext/css_styled_content/static/setup.txt b/typo3/sysext/css_styled_content/static/setup.txt
index cc865f3320be..e68ec0f78c8f 100644
--- a/typo3/sysext/css_styled_content/static/setup.txt
+++ b/typo3/sysext/css_styled_content/static/setup.txt
@@ -2081,15 +2081,15 @@ tt_content.menu {
}
# Menu of categorized pages
- 9 < .default
- 9 {
+ categorized_pages < .default
+ categorized_pages {
special = categories
special.value.field = selected_categories
special.relation.field = category_field
special.sorting = title
special.order = asc
stdWrap {
- outerWrap = <ul class="csc-menu csc-menu-9">|</ul>
+ outerWrap = <ul class="csc-menu csc-menu-categorized-pages">|</ul>
}
}
diff --git a/typo3/sysext/css_styled_content/static/v4.5/setup.txt b/typo3/sysext/css_styled_content/static/v4.5/setup.txt
index e788ca060c7d..82cf2f56482d 100644
--- a/typo3/sysext/css_styled_content/static/v4.5/setup.txt
+++ b/typo3/sysext/css_styled_content/static/v4.5/setup.txt
@@ -1530,15 +1530,15 @@ tt_content.menu {
}
# Menu of categorized pages
- 9 < .default
- 9 {
+ categorized_pages < .default
+ categorized_pages {
special = categories
special.value.field = selected_categories
special.relation.field = category_field
special.sorting = title
special.order = asc
stdWrap {
- outerWrap = <ul class="csc-menu csc-menu-9">|</ul>
+ outerWrap = <ul class="csc-menu csc-menu-categorized-pages">|</ul>
}
}
diff --git a/typo3/sysext/css_styled_content/static/v4.6/setup.txt b/typo3/sysext/css_styled_content/static/v4.6/setup.txt
index 0107fa73333a..790a61efe3d1 100644
--- a/typo3/sysext/css_styled_content/static/v4.6/setup.txt
+++ b/typo3/sysext/css_styled_content/static/v4.6/setup.txt
@@ -1480,15 +1480,15 @@ tt_content.menu {
}
# Menu of categorized pages
- 9 < .default
- 9 {
+ categorized_pages < .default
+ categorized_pages {
special = categories
special.value.field = selected_categories
special.relation.field = category_field
special.sorting = title
special.order = asc
stdWrap {
- outerWrap = <ul class="csc-menu csc-menu-9">|</ul>
+ outerWrap = <ul class="csc-menu csc-menu-categorized-pages">|</ul>
}
}
diff --git a/typo3/sysext/css_styled_content/static/v4.7/setup.txt b/typo3/sysext/css_styled_content/static/v4.7/setup.txt
index 4f7353dd8c7c..eee3571407f4 100644
--- a/typo3/sysext/css_styled_content/static/v4.7/setup.txt
+++ b/typo3/sysext/css_styled_content/static/v4.7/setup.txt
@@ -1959,15 +1959,15 @@ tt_content.menu {
}
# Menu of categorized pages
- 9 < .default
- 9 {
+ categorized_pages < .default
+ categorized_pages {
special = categories
special.value.field = selected_categories
special.relation.field = category_field
special.sorting = title
special.order = asc
stdWrap {
- outerWrap = <ul class="csc-menu csc-menu-9">|</ul>
+ outerWrap = <ul class="csc-menu csc-menu-categorized-pages">|</ul>
}
}
diff --git a/typo3/sysext/css_styled_content/static/v6.0/setup.txt b/typo3/sysext/css_styled_content/static/v6.0/setup.txt
index 9bd5f1fd9f96..672d0630ed14 100644
--- a/typo3/sysext/css_styled_content/static/v6.0/setup.txt
+++ b/typo3/sysext/css_styled_content/static/v6.0/setup.txt
@@ -1943,15 +1943,15 @@ tt_content.menu {
}
# Menu of categorized pages
- 9 < .default
- 9 {
+ categorized_pages < .default
+ categorized_pages {
special = categories
special.value.field = selected_categories
special.relation.field = category_field
special.sorting = title
special.order = asc
stdWrap {
- outerWrap = <ul class="csc-menu csc-menu-9">|</ul>
+ outerWrap = <ul class="csc-menu csc-menu-categorized-pages">|</ul>
}
}
diff --git a/typo3/sysext/css_styled_content/static/v6.1/setup.txt b/typo3/sysext/css_styled_content/static/v6.1/setup.txt
index ac8b69a51315..66cd20fb1bb5 100644
--- a/typo3/sysext/css_styled_content/static/v6.1/setup.txt
+++ b/typo3/sysext/css_styled_content/static/v6.1/setup.txt
@@ -1944,15 +1944,15 @@ tt_content.menu {
}
# Menu of categorized pages
- 9 < .default
- 9 {
+ categorized_pages < .default
+ categorized_pages {
special = categories
special.value.field = selected_categories
special.relation.field = category_field
special.sorting = title
special.order = asc
stdWrap {
- outerWrap = <ul class="csc-menu csc-menu-9">|</ul>
+ outerWrap = <ul class="csc-menu csc-menu-categorized-pages">|</ul>
}
}
diff --git a/typo3/sysext/frontend/Configuration/TCA/tt_content.php b/typo3/sysext/frontend/Configuration/TCA/tt_content.php
index ba3db1c43664..339da0b60997 100644
--- a/typo3/sysext/frontend/Configuration/TCA/tt_content.php
+++ b/typo3/sysext/frontend/Configuration/TCA/tt_content.php
@@ -1144,8 +1144,8 @@ return array(
'6'
),
array(
- 'LLL:EXT:cms/locallang_ttc.xlf:menu_type.I.9',
- '9'
+ 'LLL:EXT:cms/locallang_ttc.xlf:menu_type.I.categorized_pages',
+ 'categorized_pages'
),
array(
'LLL:EXT:cms/locallang_ttc.xlf:menu_type.I.categorized_content',
--
GitLab