diff --git a/packages/typo3-docs-theme/src/Directives/SiteSetSettingsDirective.php b/packages/typo3-docs-theme/src/Directives/SiteSetSettingsDirective.php index bd0437f7f..3a904131c 100644 --- a/packages/typo3-docs-theme/src/Directives/SiteSetSettingsDirective.php +++ b/packages/typo3-docs-theme/src/Directives/SiteSetSettingsDirective.php @@ -36,7 +36,7 @@ final class SiteSetSettingsDirective extends BaseDirective { public const NAME = 'typo3:site-set-settings'; public const FACET = 'Site Setting'; - const CATEGORY_FACET = 'Site Setting Category'; + public const CATEGORY_FACET = 'Site Setting Category'; public function __construct( private readonly LoggerInterface $logger, @@ -195,10 +195,11 @@ public function buildConfvalMenu(Directive $directive, array $settings, array $c if ($directive->getOptionString('name') !== '') { $idPrefix = $directive->getOptionString('name') . '-'; } - $categoryArray= $this->buildCategoryArray($categories, $categoryLabels); + $categoryArray = $this->buildCategoryArray($categories, $categoryLabels); $rootCategories = []; foreach ($categoryArray as $key => $category) { if (isset($categoryArray[$category['parent']])) { + assert(is_array($categoryArray[$category['parent']]['children'])); $categoryArray[$category['parent']]['children'][] = &$categoryArray[$key]; } else { $rootCategories[] = &$categoryArray[$key]; @@ -206,7 +207,7 @@ public function buildConfvalMenu(Directive $directive, array $settings, array $c } foreach ($settings as $key => $setting) { $confval = $this->buildConfval($setting, $idPrefix, $key, $directive, $labels, $descriptions, $categoryArray); - $this->assignConfvalsToCategories($setting['category']?? '', $categoryArray, $confval, $rootCategories); + $this->assignConfvalsToCategories($setting['category'] ?? '', $categoryArray, $confval, $rootCategories); } $confvals = $this->buildCategoryConfvals($rootCategories, $idPrefix, $directive); $reservedParameterNames = [ @@ -339,6 +340,8 @@ private function getCategoryRootline(array $categoryArray, string $key): string } /** + * @param array> $categories + * @param array $categoryLabels * @return array> */ public function buildCategoryArray(array $categories, array $categoryLabels): array @@ -357,12 +360,12 @@ public function buildCategoryArray(array $categories, array $categoryLabels): ar } /** - * @param array $categoryArray - * @param array $rootCategories + * @param array> $categoryArray + * @param array> $rootCategories */ public function assignConfvalsToCategories(string $category, array &$categoryArray, ConfvalNode $confval, array &$rootCategories): void { - if (isset($categoryArray[$category])) { + if (is_array($categoryArray[$category]['confvals']??false)) { $categoryArray[$category]['confvals'][] = $confval; } else { $categoryArray[$category] = [ @@ -388,22 +391,25 @@ private function buildCategoryConfvals(array $categories, string $idPrefix, Dire $confvals = []; foreach ($categories as $category) { $children = []; - if (is_array($category['children']??false)) { + if (is_array($category['children'] ?? false)) { $children = $this->buildCategoryConfvals($category['children'], $idPrefix, $directive); } $key = $category['key']; if ($key === '') { $key = '_global'; } + assert(is_string($key)); $additionalFields = []; $additionalFields['searchFacet'] = new InlineCompoundNode([new PlainTextInlineNode(self::CATEGORY_FACET)]); $label = $category['label']; if ($label !== '') { + assert(is_string($label)); $additionalFields['Label'] = new InlineCompoundNode([new PlainTextInlineNode($label)]); } + assert(is_array($category['confvals'])); $confvals[] = new ConfvalNode( - $this->anchorNormalizer->reduceAnchor($idPrefix . $key), + $this->anchorNormalizer->reduceAnchor($idPrefix .'category-'. $key), $key, null, false, diff --git a/tests/Integration/tests/roles/role-composer/expected/index.html b/tests/Integration/tests/roles/role-composer/expected/index.html index a97f32fb1..d32e09df6 100644 --- a/tests/Integration/tests/roles/role-composer/expected/index.html +++ b/tests/Integration/tests/roles/role-composer/expected/index.html @@ -13,7 +13,7 @@

Document Title typo3/testing-framework to test projects based on diff --git a/tests/Integration/tests/site-set-category/expected/index.html b/tests/Integration/tests/site-set-category/expected/index.html new file mode 100644 index 000000000..f2d18e48c --- /dev/null +++ b/tests/Integration/tests/site-set-category/expected/index.html @@ -0,0 +1,1711 @@ + +
+

Site Set Configuration

+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeLabel
fsc
 + + + Fluid Styled Content +
fsc.templates
 + + + Templates +
styles.templates.templateRootPath
 + string + + Path of Fluid Templates for all defined content elements +
styles.templates.partialRootPath
 + string + + Path of Fluid Partials for all defined content elements +
styles.templates.layoutRootPath
 + string + + Path of Fluid Layouts for all defined content elements +
fsc.content
 + + + Content Elements +
styles.content.defaultHeaderType
 + int + + Default Header type +
styles.content.shortcut.tables
 + string + + List of accepted tables +
styles.content.allowTags
 + string + + List of allowed HTML tags when rendering RTE content +
styles.content.image.lazyLoading
 + string + + Default settings for browser-native image lazy loading +
styles.content.image.imageDecoding
 + string + + Default settings for an image decoding hint to the browser +
styles.content.textmedia.maxW
 + int + + Max Image/Media Width +
styles.content.textmedia.maxWInText
 + int + + Max Image/Media Width (Text) +
styles.content.textmedia.columnSpacing
 + int + + Advanced, Column space +
styles.content.textmedia.rowSpacing
 + int + + Advanced, Row space +
styles.content.textmedia.textMargin
 + int + + Advanced, Margin to text +
styles.content.textmedia.borderColor
 + color + + Media element border, color +
styles.content.textmedia.borderWidth
 + int + + Media element border, thickness +
styles.content.textmedia.borderPadding
 + int + + Media element border, padding +
styles.content.textmedia.linkWrap.width
 + string + + Click-enlarge Media Width +
styles.content.textmedia.linkWrap.height
 + string + + Click-enlarge Media Height +
styles.content.textmedia.linkWrap.newWindow
 + bool + + Advanced, New window +
styles.content.textmedia.linkWrap.lightboxEnabled
 + bool + + Lightbox click-enlarge rendering +
styles.content.textmedia.linkWrap.lightboxCssClass
 + string + + Lightbox CSS class +
styles.content.textmedia.linkWrap.lightboxRelAttribute
 + string + + Lightbox rel="" attribute +
styles.content.links.extTarget
 + string + + Target for external links +
styles.content.links.keep
 + string + + Parts to keep when building links +
+
+
+

fsc

+
+
+
+ fsc + +
+
+
+
+
+
Label
+
Fluid Styled Content +
+
+
+
+

fsc.templates

+
+
+
+ fsc.templates + +
+
+
+
+
+
Label
+
Templates +
+
+
+
+

styles.templates.templateRootPath

+
+
+
+ styles.templates.templateRootPath + +
+
+
+
+
+
Type
+
string +
+
Label
+
Path of Fluid Templates for all defined content elements +
+
Category
+
Fluid Styled Content > Templates +
+
+
+ +
+
+
+
+

styles.templates.partialRootPath

+
+
+
+ styles.templates.partialRootPath + +
+
+
+
+
+
Type
+
string +
+
Label
+
Path of Fluid Partials for all defined content elements +
+
Category
+
Fluid Styled Content > Templates +
+
+
+ +
+
+
+
+

styles.templates.layoutRootPath

+
+
+
+ styles.templates.layoutRootPath + +
+
+
+
+
+
Type
+
string +
+
Label
+
Path of Fluid Layouts for all defined content elements +
+
Category
+
Fluid Styled Content > Templates +
+
+
+ +
+
+
+
+
+
+
+
+

fsc.content

+
+
+
+ fsc.content + +
+
+
+
+
+
Label
+
Content Elements +
+
+
+
+

styles.content.defaultHeaderType

+
+
+
+ styles.content.defaultHeaderType + +
+
+
+
+
+
Type
+
int +
+
Default
+
2 +
+
Label
+
Default Header type +
+
Category
+
Fluid Styled Content > Content Elements +
+
+
+ +

Enter the number of the header layout to be used by default

+ +
+
+
+
+

styles.content.shortcut.tables

+
+
+
+ styles.content.shortcut.tables + +
+
+
+
+
+
Type
+
string +
+
Default
+
"tt_content" +
+
Label
+
List of accepted tables +
+
Category
+
Fluid Styled Content > Content Elements +
+
+
+ +
+
+
+
+

styles.content.allowTags

+
+
+
+ styles.content.allowTags + +
+
+
+
+
+
Type
+
string +
+
Default
+
"a, abbr, acronym, address, article, aside, b, bdo, big, blockquote, br, caption, center, cite, code, col, colgroup, dd, del, dfn, dl, div, dt, em, figure, font, footer, header, h1, h2, h3, h4, h5, h6, hr, i, img, ins, kbd, label, li, link, mark, meta, nav, ol, p, pre, q, s, samp, sdfield, section, small, span, strike, strong, style, sub, sup, table, thead, tbody, tfoot, td, th, tr, title, tt, u, ul, var" +
+
Label
+
List of allowed HTML tags when rendering RTE content +
+
Category
+
Fluid Styled Content > Content Elements +
+
+
+ +
+
+
+
+

styles.content.image.lazyLoading

+
+
+
+ styles.content.image.lazyLoading + +
+
+
+
+
+
Type
+
string +
+
Default
+
"lazy" +
+
Label
+
Default settings for browser-native image lazy loading +
+
Enum
+
{ + "lazy": "Lazy", + "eager": "Eager", + "auto": "Auto" +} +
+
Category
+
Fluid Styled Content > Content Elements +
+
+
+ +

Can be "lazy" (browsers could choose to load images later), "eager" (load images right away) or "auto" (browser will determine whether the image should be lazy loaded or not)

+ +
+
+
+
+

styles.content.image.imageDecoding

+
+
+
+ styles.content.image.imageDecoding + +
+
+
+
+
+
Type
+
string +
+
Label
+
Default settings for an image decoding hint to the browser +
+
Enum
+
{ + "sync": "Sync", + "async": "Asynchronous", + "auto": "Auto" +} +
+
Category
+
Fluid Styled Content > Content Elements +
+
+
+ +

Can be "sync" (synchronously for atomic presentation with other content), "async" (asynchronously to avoid delaying presentation of other content), "auto" (no preference in decoding mode) or an empty value to omit the usage of the decoding attribute (same as "auto")

+ +
+
+
+
+

styles.content.textmedia.maxW

+
+
+
+ styles.content.textmedia.maxW + +
+
+
+
+
+
Type
+
int +
+
Default
+
600 +
+
Label
+
Max Image/Media Width +
+
Category
+
Fluid Styled Content > Content Elements +
+
+
+ +

This indicates that maximum number of pixels (width) a block of media elements inserted as content is allowed to consume

+ +
+
+
+
+

styles.content.textmedia.maxWInText

+
+
+
+ styles.content.textmedia.maxWInText + +
+
+
+
+
+
Type
+
int +
+
Default
+
300 +
+
Label
+
Max Image/Media Width (Text) +
+
Category
+
Fluid Styled Content > Content Elements +
+
+
+ +

Same as above, but this is the maximum width when text is wrapped around an block of media elements. Default is 50% of the normal Max Media Item Width

+ +
+
+
+
+

styles.content.textmedia.columnSpacing

+
+
+
+ styles.content.textmedia.columnSpacing + +
+
+
+
+
+
Type
+
int +
+
Default
+
10 +
+
Label
+
Advanced, Column space +
+
Category
+
Fluid Styled Content > Content Elements +
+
+
+ +

Horizontal distance between media elements in a block in content elements of type "Media & Images". If you change this manually in your CSS, you need to adjust this setting accordingly

+ +
+
+
+
+

styles.content.textmedia.rowSpacing

+
+
+
+ styles.content.textmedia.rowSpacing + +
+
+
+
+
+
Type
+
int +
+
Default
+
10 +
+
Label
+
Advanced, Row space +
+
Category
+
Fluid Styled Content > Content Elements +
+
+
+ +

Vertical distance after each media elements row in content elements of type ""Text & Media". If you change this manually in your CSS, you need to adjust this setting accordingly

+ +
+
+
+
+

styles.content.textmedia.textMargin

+
+
+
+ styles.content.textmedia.textMargin + +
+
+
+
+
+
Type
+
int +
+
Default
+
10 +
+
Label
+
Advanced, Margin to text +
+
Category
+
Fluid Styled Content > Content Elements +
+
+
+ +

Horizontal distance between an imageblock and text in content elements of type "Text & Images"

+ +
+
+
+
+

styles.content.textmedia.borderColor

+
+
+
+ styles.content.textmedia.borderColor + +
+
+
+
+
+
Type
+
color +
+
Default
+
"#000000" +
+
Label
+
Media element border, color +
+
Category
+
Fluid Styled Content > Content Elements +
+
+
+ +

Bordercolor of media elements in content elements when "Border"-option for an element is set

+ +
+
+
+
+

styles.content.textmedia.borderWidth

+
+
+
+ styles.content.textmedia.borderWidth + +
+
+
+
+
+
Type
+
int +
+
Default
+
2 +
+
Label
+
Media element border, thickness +
+
Category
+
Fluid Styled Content > Content Elements +
+
+
+ +

Thickness of border around media elements in content elements when "Border"-option for element is set

+ +
+
+
+
+

styles.content.textmedia.borderPadding

+
+
+
+ styles.content.textmedia.borderPadding + +
+
+
+
+
+
Type
+
int +
+
Default
+
0 +
+
Label
+
Media element border, padding +
+
Category
+
Fluid Styled Content > Content Elements +
+
+
+ +

Padding left and right to the media element, around the border

+ +
+
+
+
+

styles.content.textmedia.linkWrap.width

+
+
+
+ styles.content.textmedia.linkWrap.width + +
+
+
+
+
+
Type
+
string +
+
Default
+
"800m" +
+
Label
+
Click-enlarge Media Width +
+
Category
+
Fluid Styled Content > Content Elements +
+
+
+ +

This specifies the width of the enlarged media element when click-enlarge is enabled

+ +
+
+
+
+

styles.content.textmedia.linkWrap.height

+
+
+
+ styles.content.textmedia.linkWrap.height + +
+
+
+
+
+
Type
+
string +
+
Default
+
"600m" +
+
Label
+
Click-enlarge Media Height +
+
Category
+
Fluid Styled Content > Content Elements +
+
+
+ +

This specifies the height of the enlarged media element when click-enlarge is enabled

+ +
+
+
+
+

styles.content.textmedia.linkWrap.newWindow

+
+
+
+ styles.content.textmedia.linkWrap.newWindow + +
+
+
+
+
+
Type
+
bool +
+
Default
+
false +
+
Label
+
Advanced, New window +
+
Category
+
Fluid Styled Content > Content Elements +
+
+
+ +

If set, every click-enlarged media element will open in it's own popup window and not the current popup window (which may have a wrong size for the media element to fit in)

+ +
+
+
+
+

styles.content.textmedia.linkWrap.lightboxEnabled

+
+
+
+ styles.content.textmedia.linkWrap.lightboxEnabled + +
+
+
+
+
+
Type
+
bool +
+
Default
+
false +
+
Label
+
Lightbox click-enlarge rendering +
+
Category
+
Fluid Styled Content > Content Elements +
+
+
+ +

Whether media elements with click-enlarge checked should be rendered lightbox-compliant

+ +
+
+
+
+

styles.content.textmedia.linkWrap.lightboxCssClass

+
+
+
+ styles.content.textmedia.linkWrap.lightboxCssClass + +
+
+
+
+
+
Type
+
string +
+
Default
+
"lightbox" +
+
Label
+
Lightbox CSS class +
+
Category
+
Fluid Styled Content > Content Elements +
+
+
+ +

Which CSS class to use for lightbox links (only applicable if lightbox rendering is enabled)

+ +
+
+
+
+

styles.content.textmedia.linkWrap.lightboxRelAttribute

+
+
+
+ styles.content.textmedia.linkWrap.lightboxRelAttribute + +
+
+
+
+
+
Type
+
string +
+
Default
+
"lightbox[{field:uid}]" +
+
Label
+
Lightbox rel="" attribute +
+
Category
+
Fluid Styled Content > Content Elements +
+
+
+ +

Which rel="" attribute to use for lightbox links (only applicable if lightbox rendering is enabled)

+ +
+
+
+
+

styles.content.links.extTarget

+
+
+
+ styles.content.links.extTarget + +
+
+
+
+
+
Type
+
string +
+
Default
+
"_blank" +
+
Label
+
Target for external links +
+
Category
+
Fluid Styled Content > Content Elements +
+
+
+ +
+
+
+
+

styles.content.links.keep

+
+
+
+ styles.content.links.keep + +
+
+
+
+
+
Type
+
string +
+
Default
+
"path" +
+
Label
+
Parts to keep when building links +
+
Category
+
Fluid Styled Content > Content Elements +
+
+
+ +

Comma separated list of the link parts to show when building the link-text: scheme,path,query. Example: "" (empty) => www.example.com, "scheme,path" => http://www.example.com

+ +
+
+
+
+
+
+
+
+
+
+
+
+ +
+ diff --git a/tests/Integration/tests/site-set-category/input/_includes/Sets/Felogin/labels.xlf b/tests/Integration/tests/site-set-category/input/_includes/Sets/Felogin/labels.xlf new file mode 100644 index 000000000..eec39bda9 --- /dev/null +++ b/tests/Integration/tests/site-set-category/input/_includes/Sets/Felogin/labels.xlf @@ -0,0 +1,148 @@ + + + +
+ + + Fluid Styled Content + + + + Fluid Styled Content + + + Templates + + + Content Elements + + + + Default Header type + + + Enter the number of the header layout to be used by default + + + List of accepted tables + + + List of allowed HTML tags when rendering RTE content + + + Default settings for browser-native image lazy loading + + + Can be "lazy" (browsers could choose to load images later), "eager" (load images right away) or "auto" (browser will determine whether the image should be lazy loaded or not) + + + Default settings for an image decoding hint to the browser + + + Can be "sync" (synchronously for atomic presentation with other content), "async" (asynchronously to avoid delaying presentation of other content), "auto" (no preference in decoding mode) or an empty value to omit the usage of the decoding attribute (same as "auto") + + + Max Image/Media Width + + + This indicates that maximum number of pixels (width) a block of media elements inserted as content is allowed to consume + + + Max Image/Media Width (Text) + + + Same as above, but this is the maximum width when text is wrapped around an block of media elements. Default is 50% of the normal Max Media Item Width + + + Advanced, Column space + + + Horizontal distance between media elements in a block in content elements of type "Media & Images". If you change this manually in your CSS, you need to adjust this setting accordingly + + + Advanced, Row space + + + Vertical distance after each media elements row in content elements of type ""Text & Media". If you change this manually in your CSS, you need to adjust this setting accordingly + + + Advanced, Margin to text + + + Horizontal distance between an imageblock and text in content elements of type "Text & Images" + + + Media element border, color + + + Bordercolor of media elements in content elements when "Border"-option for an element is set + + + Media element border, thickness + + + Thickness of border around media elements in content elements when "Border"-option for element is set + + + Media element border, padding + + + Padding left and right to the media element, around the border + + + Click-enlarge Media Width + + + This specifies the width of the enlarged media element when click-enlarge is enabled + + + Click-enlarge Media Height + + + This specifies the height of the enlarged media element when click-enlarge is enabled + + + Advanced, New window + + + If set, every click-enlarged media element will open in it's own popup window and not the current popup window (which may have a wrong size for the media element to fit in) + + + Lightbox click-enlarge rendering + + + Whether media elements with click-enlarge checked should be rendered lightbox-compliant + + + Lightbox CSS class + + + Which CSS class to use for lightbox links (only applicable if lightbox rendering is enabled) + + + Lightbox rel="" attribute + + + Which rel="" attribute to use for lightbox links (only applicable if lightbox rendering is enabled) + + + Target for external links + + + Parts to keep when building links + + + Comma separated list of the link parts to show when building the link-text: scheme,path,query. Example: "" (empty) => www.example.com, "scheme,path" => http://www.example.com + + + Path of Fluid Templates for all defined content elements + + + Path of Fluid Partials for all defined content elements + + + Path of Fluid Layouts for all defined content elements + + + + diff --git a/tests/Integration/tests/site-set-category/input/_includes/Sets/Felogin/settings.definitions.yaml b/tests/Integration/tests/site-set-category/input/_includes/Sets/Felogin/settings.definitions.yaml new file mode 100644 index 000000000..b9b960857 --- /dev/null +++ b/tests/Integration/tests/site-set-category/input/_includes/Sets/Felogin/settings.definitions.yaml @@ -0,0 +1,112 @@ +categories: + fsc: ~ + fsc.templates: + parent: fsc + fsc.content: + parent: fsc + +settings: + styles.content.defaultHeaderType: + default: 2 + type: int + category: fsc.content + styles.content.shortcut.tables: + default: tt_content + type: string + category: fsc.content + styles.content.allowTags: + default: 'a, abbr, acronym, address, article, aside, b, bdo, big, blockquote, br, caption, center, cite, code, col, colgroup, dd, del, dfn, dl, div, dt, em, figure, font, footer, header, h1, h2, h3, h4, h5, h6, hr, i, img, ins, kbd, label, li, link, mark, meta, nav, ol, p, pre, q, s, samp, sdfield, section, small, span, strike, strong, style, sub, sup, table, thead, tbody, tfoot, td, th, tr, title, tt, u, ul, var' + type: string + category: fsc.content + styles.content.image.lazyLoading: + default: lazy + type: string + enum: + lazy: 'Lazy' + eager: 'Eager' + auto: 'Auto' + category: fsc.content + styles.content.image.imageDecoding: + default: '' + type: string + enum: + sync: 'Sync' + async: 'Asynchronous' + auto: 'Auto' + category: fsc.content + styles.content.textmedia.maxW: + default: 600 + type: int + category: fsc.content + styles.content.textmedia.maxWInText: + default: 300 + type: int + category: fsc.content + styles.content.textmedia.columnSpacing: + default: 10 + type: int + category: fsc.content + styles.content.textmedia.rowSpacing: + default: 10 + type: int + category: fsc.content + styles.content.textmedia.textMargin: + default: 10 + type: int + category: fsc.content + styles.content.textmedia.borderColor: + default: '#000000' + type: color + category: fsc.content + styles.content.textmedia.borderWidth: + default: 2 + type: int + category: fsc.content + styles.content.textmedia.borderPadding: + default: 0 + type: int + category: fsc.content + styles.content.textmedia.linkWrap.width: + default: 800m + type: string + category: fsc.content + styles.content.textmedia.linkWrap.height: + default: 600m + type: string + category: fsc.content + styles.content.textmedia.linkWrap.newWindow: + default: false + type: bool + category: fsc.content + styles.content.textmedia.linkWrap.lightboxEnabled: + default: false + type: bool + category: fsc.content + styles.content.textmedia.linkWrap.lightboxCssClass: + default: lightbox + type: string + category: fsc.content + styles.content.textmedia.linkWrap.lightboxRelAttribute: + default: 'lightbox[{field:uid}]' + type: string + category: fsc.content + styles.content.links.extTarget: + default: _blank + type: string + category: fsc.content + styles.content.links.keep: + default: path + type: string + category: fsc.content + styles.templates.templateRootPath: + default: '' + type: string + category: fsc.templates + styles.templates.partialRootPath: + default: '' + type: string + category: fsc.templates + styles.templates.layoutRootPath: + default: '' + type: string + category: fsc.templates diff --git a/tests/Integration/tests/site-set-category/input/index.rst b/tests/Integration/tests/site-set-category/input/index.rst new file mode 100644 index 000000000..168da86c5 --- /dev/null +++ b/tests/Integration/tests/site-set-category/input/index.rst @@ -0,0 +1,8 @@ +====================== +Site Set Configuration +====================== + +.. typo3:site-set-settings:: _includes/Sets/Felogin/settings.definitions.yaml + :name: felogin + :type: + :Label: diff --git a/tests/Integration/tests/site-set-ext-syntax/expected/index.html b/tests/Integration/tests/site-set-ext-syntax/expected/index.html index f525caeed..9f128fce8 100644 --- a/tests/Integration/tests/site-set-ext-syntax/expected/index.html +++ b/tests/Integration/tests/site-set-ext-syntax/expected/index.html @@ -17,7 +17,15 @@

Site Set Configuration -
styles.content.defaultHeaderType
+
_global
+ + + + + + + +
styles.content.defaultHeaderType
Site Set Configuration - -
styles.content.shortcut.tables
+ +
styles.content.shortcut.tables
Site Set Configuration - -
styles.content.allowTags
+ +
styles.content.allowTags
Site Set Configuration - -
styles.content.image.lazyLoading
+ +
styles.content.image.lazyLoading
Site Set Configuration - -
styles.content.image.imageDecoding
+ +
styles.content.image.imageDecoding
Site Set Configuration - -
styles.content.textmedia.maxW
+ +
styles.content.textmedia.maxW
Site Set Configuration - -
styles.content.textmedia.maxWInText
+ +
styles.content.textmedia.maxWInText
Site Set Configuration - -
styles.content.textmedia.columnSpacing
+ +
styles.content.textmedia.columnSpacing
Site Set Configuration - -
styles.content.textmedia.rowSpacing
+ +
styles.content.textmedia.rowSpacing
Site Set Configuration - -
styles.content.textmedia.textMargin
+ +
styles.content.textmedia.textMargin
Site Set Configuration - -
styles.content.textmedia.borderColor
+ +
styles.content.textmedia.borderColor
Site Set Configuration - -
styles.content.textmedia.borderWidth
+ +
styles.content.textmedia.borderWidth
Site Set Configuration - -
styles.content.textmedia.borderPadding
+ +
styles.content.textmedia.borderPadding
Site Set Configuration - -
styles.content.textmedia.linkWrap.width
+ +
styles.content.textmedia.linkWrap.width
Site Set Configuration - -
styles.content.textmedia.linkWrap.height
+ +
styles.content.textmedia.linkWrap.height
Site Set Configuration - -
styles.content.textmedia.linkWrap.newWindow
+ +
styles.content.textmedia.linkWrap.newWindow
Site Set Configuration - -
styles.content.textmedia.linkWrap.lightboxEnabled
+ +
styles.content.textmedia.linkWrap.lightboxEnabled
Site Set Configuration - -
styles.content.textmedia.linkWrap.lightboxCssClass
+ +
styles.content.textmedia.linkWrap.lightboxCssClass
Site Set Configuration - -
styles.content.textmedia.linkWrap.lightboxRelAttribute
+ +
styles.content.textmedia.linkWrap.lightboxRelAttribute
Site Set Configuration - -
styles.content.links.extTarget
+ +
styles.content.links.extTarget
Site Set Configuration - -
styles.content.links.keep
+ +
styles.content.links.keep
Site Set Configuration - -
styles.templates.templateRootPath
+ +
styles.templates.templateRootPath
Site Set Configuration - -
styles.templates.partialRootPath
+ +
styles.templates.partialRootPath
Site Set Configuration - -
styles.templates.layoutRootPath
+ +
styles.templates.layoutRootPath
Site Set Configuration + -
+

_global

+
+
+
+ _global + +
+
+
+
+
+
+
+
styles.content.defaultHeaderType

- -
styles.content.shortcut.tables

- -
styles.content.allowTags -
-
styles.content.image.lazyLoading -
-
styles.content.image.imageDecoding -
-
styles.content.textmedia.maxW -
-
styles.content.textmedia.maxWInText -
-
styles.content.textmedia.columnSpacing -
-
styles.content.textmedia.rowSpacing -
-
styles.content.textmedia.textMargin -
-
styles.content.textmedia.borderColor -
-
styles.content.textmedia.borderWidth -
-
styles.content.textmedia.borderPadding -
-
styles.content.textmedia.linkWrap.width -
-
styles.content.textmedia.linkWrap.height -
-
styles.content.textmedia.linkWrap.newWindow -
-
styles.content.textmedia.linkWrap.lightboxEnabled -
-
styles.content.textmedia.linkWrap.lightboxCssClass -
-
styles.content.textmedia.linkWrap.lightboxRelAttribute -
-
styles.content.links.extTarget -
-
styles.content.links.keep -
-
styles.templates.templateRootPath -
-
styles.templates.partialRootPath -
-
styles.templates.layoutRootPath
+ + + +
diff --git a/tests/Integration/tests/site-set-labels-autoload/expected/index.html b/tests/Integration/tests/site-set-labels-autoload/expected/index.html index 6079b615e..f7178c39a 100644 --- a/tests/Integration/tests/site-set-labels-autoload/expected/index.html +++ b/tests/Integration/tests/site-set-labels-autoload/expected/index.html @@ -17,7 +17,15 @@

Site Set Configuration -
felogin.pid
+
_global
+ + + + + + + +
felogin.pid
Site Set Configuration - -
felogin.recursive
+ +
felogin.recursive
Site Set Configuration - -
felogin.showForgotPassword
+ +
felogin.showForgotPassword
Site Set Configuration - -
felogin.showPermaLogin
+ +
felogin.showPermaLogin
Site Set Configuration - -
felogin.showLogoutFormAfterLogin
+ +
felogin.showLogoutFormAfterLogin
Site Set Configuration - -
felogin.emailFrom
+ +
felogin.emailFrom
Site Set Configuration - -
felogin.emailFromName
+ +
felogin.emailFromName
Site Set Configuration - -
felogin.replyToEmail
+ +
felogin.replyToEmail
Site Set Configuration - -
felogin.dateFormat
+ +
felogin.dateFormat
Site Set Configuration - -
felogin.email.layoutRootPath
+ +
felogin.email.layoutRootPath
Site Set Configuration - -
felogin.email.templateRootPath
+ +
felogin.email.templateRootPath
Site Set Configuration - -
felogin.email.partialRootPath
+ +
felogin.email.partialRootPath
Site Set Configuration - -
felogin.email.templateName
+ +
felogin.email.templateName
Site Set Configuration - -
felogin.redirectMode
+ +
felogin.redirectMode
Site Set Configuration - -
felogin.redirectFirstMethod
+ +
felogin.redirectFirstMethod
Site Set Configuration - -
felogin.redirectPageLogin
+ +
felogin.redirectPageLogin
Site Set Configuration - -
felogin.redirectPageLoginError
+ +
felogin.redirectPageLoginError
Site Set Configuration - -
felogin.redirectPageLogout
+ +
felogin.redirectPageLogout
Site Set Configuration - -
felogin.redirectDisable
+ +
felogin.redirectDisable
Site Set Configuration - -
felogin.forgotLinkHashValidTime
+ +
felogin.forgotLinkHashValidTime
Site Set Configuration - -
felogin.domains
+ +
felogin.domains
Site Set Configuration - -
felogin.exposeNonexistentUserInForgotPasswordDialog
+ +
felogin.exposeNonexistentUserInForgotPasswordDialog
Site Set Configuration - -
felogin.view.templateRootPath
+ +
felogin.view.templateRootPath
Site Set Configuration - -
felogin.view.partialRootPath
+ +
felogin.view.partialRootPath
Site Set Configuration - -
felogin.view.layoutRootPath
+ +
felogin.view.layoutRootPath
Site Set Configuration + -
+

_global

+
+
+
+ _global + +
+
+
+
+
+
+
+
felogin.pid

-
-
felogin.recursive -
-
felogin.showForgotPassword -
-
felogin.showPermaLogin -
-
felogin.showLogoutFormAfterLogin -
-
felogin.emailFrom -
-
felogin.emailFromName -
-
felogin.replyToEmail -
-
felogin.dateFormat -
-
felogin.email.layoutRootPath -
-
felogin.email.templateRootPath -
-
felogin.email.partialRootPath -
-
felogin.email.templateName -
-
felogin.redirectMode -
-
felogin.redirectFirstMethod -
-
felogin.redirectPageLogin -
-
felogin.redirectPageLoginError -
-
felogin.redirectPageLogout -
-
felogin.redirectDisable -
-
felogin.forgotLinkHashValidTime -
-
felogin.domains -
-
felogin.exposeNonexistentUserInForgotPasswordDialog -
-
felogin.view.templateRootPath -
-
felogin.view.partialRootPath -
-
felogin.view.layoutRootPath
+ + + +
diff --git a/tests/Integration/tests/site-set-labels/expected/index.html b/tests/Integration/tests/site-set-labels/expected/index.html index 6079b615e..f7178c39a 100644 --- a/tests/Integration/tests/site-set-labels/expected/index.html +++ b/tests/Integration/tests/site-set-labels/expected/index.html @@ -17,7 +17,15 @@

Site Set Configuration -
felogin.pid
+
_global
+ + + + + + + +
felogin.pid
Site Set Configuration - -
felogin.recursive
+ +
felogin.recursive
Site Set Configuration - -
felogin.showForgotPassword
+ +
felogin.showForgotPassword
Site Set Configuration - -
felogin.showPermaLogin
+ +
felogin.showPermaLogin
Site Set Configuration - -
felogin.showLogoutFormAfterLogin
+ +
felogin.showLogoutFormAfterLogin
Site Set Configuration - -
felogin.emailFrom
+ +
felogin.emailFrom
Site Set Configuration - -
felogin.emailFromName
+ +
felogin.emailFromName
Site Set Configuration - -
felogin.replyToEmail
+ +
felogin.replyToEmail
Site Set Configuration - -
felogin.dateFormat
+ +
felogin.dateFormat
Site Set Configuration - -
felogin.email.layoutRootPath
+ +
felogin.email.layoutRootPath
Site Set Configuration - -
felogin.email.templateRootPath
+ +
felogin.email.templateRootPath
Site Set Configuration - -
felogin.email.partialRootPath
+ +
felogin.email.partialRootPath
Site Set Configuration - -
felogin.email.templateName
+ +
felogin.email.templateName
Site Set Configuration - -
felogin.redirectMode
+ +
felogin.redirectMode
Site Set Configuration - -
felogin.redirectFirstMethod
+ +
felogin.redirectFirstMethod
Site Set Configuration - -
felogin.redirectPageLogin
+ +
felogin.redirectPageLogin
Site Set Configuration - -
felogin.redirectPageLoginError
+ +
felogin.redirectPageLoginError
Site Set Configuration - -
felogin.redirectPageLogout
+ +
felogin.redirectPageLogout
Site Set Configuration - -
felogin.redirectDisable
+ +
felogin.redirectDisable
Site Set Configuration - -
felogin.forgotLinkHashValidTime
+ +
felogin.forgotLinkHashValidTime
Site Set Configuration - -
felogin.domains
+ +
felogin.domains
Site Set Configuration - -
felogin.exposeNonexistentUserInForgotPasswordDialog
+ +
felogin.exposeNonexistentUserInForgotPasswordDialog
Site Set Configuration - -
felogin.view.templateRootPath
+ +
felogin.view.templateRootPath
Site Set Configuration - -
felogin.view.partialRootPath
+ +
felogin.view.partialRootPath
Site Set Configuration - -
felogin.view.layoutRootPath
+ +
felogin.view.layoutRootPath
Site Set Configuration + -
+

_global

+
+
+
+ _global + +
+
+
+
+
+
+
+
felogin.pid

-
-
felogin.recursive -
-
felogin.showForgotPassword -
-
felogin.showPermaLogin -
-
felogin.showLogoutFormAfterLogin -
-
felogin.emailFrom -
-
felogin.emailFromName -
-
felogin.replyToEmail -
-
felogin.dateFormat -
-
felogin.email.layoutRootPath -
-
felogin.email.templateRootPath -
-
felogin.email.partialRootPath -
-
felogin.email.templateName -
-
felogin.redirectMode -
-
felogin.redirectFirstMethod -
-
felogin.redirectPageLogin -
-
felogin.redirectPageLoginError -
-
felogin.redirectPageLogout -
-
felogin.redirectDisable -
-
felogin.forgotLinkHashValidTime -
-
felogin.domains -
-
felogin.exposeNonexistentUserInForgotPasswordDialog -
-
felogin.view.templateRootPath -
-
felogin.view.partialRootPath -
-
felogin.view.layoutRootPath
+ + + +
diff --git a/tests/Integration/tests/site-set/expected/index.html b/tests/Integration/tests/site-set/expected/index.html index 6079b615e..f7178c39a 100644 --- a/tests/Integration/tests/site-set/expected/index.html +++ b/tests/Integration/tests/site-set/expected/index.html @@ -17,7 +17,15 @@

Site Set Configuration -
felogin.pid
+
_global
+ + + + + + + +
felogin.pid
Site Set Configuration - -
felogin.recursive
+ +
felogin.recursive
Site Set Configuration - -
felogin.showForgotPassword
+ +
felogin.showForgotPassword
Site Set Configuration - -
felogin.showPermaLogin
+ +
felogin.showPermaLogin
Site Set Configuration - -
felogin.showLogoutFormAfterLogin
+ +
felogin.showLogoutFormAfterLogin
Site Set Configuration - -
felogin.emailFrom
+ +
felogin.emailFrom
Site Set Configuration - -
felogin.emailFromName
+ +
felogin.emailFromName
Site Set Configuration - -
felogin.replyToEmail
+ +
felogin.replyToEmail
Site Set Configuration - -
felogin.dateFormat
+ +
felogin.dateFormat
Site Set Configuration - -
felogin.email.layoutRootPath
+ +
felogin.email.layoutRootPath
Site Set Configuration - -
felogin.email.templateRootPath
+ +
felogin.email.templateRootPath
Site Set Configuration - -
felogin.email.partialRootPath
+ +
felogin.email.partialRootPath
Site Set Configuration - -
felogin.email.templateName
+ +
felogin.email.templateName
Site Set Configuration - -
felogin.redirectMode
+ +
felogin.redirectMode
Site Set Configuration - -
felogin.redirectFirstMethod
+ +
felogin.redirectFirstMethod
Site Set Configuration - -
felogin.redirectPageLogin
+ +
felogin.redirectPageLogin
Site Set Configuration - -
felogin.redirectPageLoginError
+ +
felogin.redirectPageLoginError
Site Set Configuration - -
felogin.redirectPageLogout
+ +
felogin.redirectPageLogout
Site Set Configuration - -
felogin.redirectDisable
+ +
felogin.redirectDisable
Site Set Configuration - -
felogin.forgotLinkHashValidTime
+ +
felogin.forgotLinkHashValidTime
Site Set Configuration - -
felogin.domains
+ +
felogin.domains
Site Set Configuration - -
felogin.exposeNonexistentUserInForgotPasswordDialog
+ +
felogin.exposeNonexistentUserInForgotPasswordDialog
Site Set Configuration - -
felogin.view.templateRootPath
+ +
felogin.view.templateRootPath
Site Set Configuration - -
felogin.view.partialRootPath
+ +
felogin.view.partialRootPath
Site Set Configuration - -
felogin.view.layoutRootPath
+ +
felogin.view.layoutRootPath
Site Set Configuration + -
+

_global

+
+
+
+ _global + +
+
+
+
+
+
+
+
felogin.pid

-
-
felogin.recursive -
-
felogin.showForgotPassword -
-
felogin.showPermaLogin -
-
felogin.showLogoutFormAfterLogin -
-
felogin.emailFrom -
-
felogin.emailFromName -
-
felogin.replyToEmail -
-
felogin.dateFormat -
-
felogin.email.layoutRootPath -
-
felogin.email.templateRootPath -
-
felogin.email.partialRootPath -
-
felogin.email.templateName -
-
felogin.redirectMode -
-
felogin.redirectFirstMethod -
-
felogin.redirectPageLogin -
-
felogin.redirectPageLoginError -
-
felogin.redirectPageLogout -
-
felogin.redirectDisable -
-
felogin.forgotLinkHashValidTime -
-
felogin.domains -
-
felogin.exposeNonexistentUserInForgotPasswordDialog -
-
felogin.view.templateRootPath -
-
felogin.view.partialRootPath -
-
felogin.view.layoutRootPath
+ + + +