From 3c3cd2944ca11eae8c399217a6661758f68402f4 Mon Sep 17 00:00:00 2001 From: Georg Ringer <georg.ringer@gmail.com> Date: Tue, 2 May 2017 15:04:36 +0200 Subject: [PATCH] [TASK] Remove references to EXT:static_template Since 6.2 static_template has been moved into the TER. Remove any usages of that old thing in the core. Resolves: #81108 Releases: master Change-Id: I3e756210a44da26f3e2fdf2e2c8d94c882a4cf89 Reviewed-on: https://review.typo3.org/52681 Tested-by: TYPO3com <no-reply@typo3.com> Reviewed-by: Benni Mack <benni@typo3.org> Tested-by: Benni Mack <benni@typo3.org> Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl> Tested-by: Wouter Wolters <typo3@wouterwolters.nl> --- .../Language/locallang_csh_statictpl.xlf | 55 ------- .../Language/locallang_csh_systmpl.xlf | 136 ------------------ .../Public/Images/cshimages/static.png | Bin 5674 -> 0 bytes typo3/sysext/context_help/ext_tables.php | 1 - .../Classes/TypoScript/TemplateService.php | 16 +-- .../Utility/ExtensionManagementUtility.php | 4 +- .../Controller/PageInformationController.php | 3 +- .../t3editor/Resources/Private/tsref.xml | 6 +- 8 files changed, 12 insertions(+), 209 deletions(-) delete mode 100644 typo3/sysext/context_help/Resources/Private/Language/locallang_csh_statictpl.xlf delete mode 100644 typo3/sysext/context_help/Resources/Private/Language/locallang_csh_systmpl.xlf delete mode 100644 typo3/sysext/context_help/Resources/Public/Images/cshimages/static.png diff --git a/typo3/sysext/context_help/Resources/Private/Language/locallang_csh_statictpl.xlf b/typo3/sysext/context_help/Resources/Private/Language/locallang_csh_statictpl.xlf deleted file mode 100644 index f5d15de72c47..000000000000 --- a/typo3/sysext/context_help/Resources/Private/Language/locallang_csh_statictpl.xlf +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff"> - <file t3:id="1415814799" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:32Z" product-name="context_help"> - <header/> - <body> - <trans-unit id=".description"> - <source>Static templates are a centrally distributed TypoScript library. You should never change these values.</source> - </trans-unit> - <trans-unit id=".details" xml:space="preserve"> - <source>The Static templates are meant to be included by your TypoScript Template records depending on your needs. Refer to the 'TSref' document (see below) for details on this process. -Notice that by each release of TYPO3 you should reinstall the Static Templates table by the install tool. See the 'Install/Upgrade' document for details (see below).</source> - </trans-unit> - <trans-unit id="_.seeAlso" xml:space="preserve"> - <source>sys_template -TSref | https://docs.typo3.org/typo3cms/TyposcriptReference/ -TypoScript in 45 min| https://docs.typo3.org/typo3cms/TyposcriptIn45MinutesTutorial/ -Install/Upgrade | https://docs.typo3.org/typo3cms/InstallationGuide/, -sys_template:include_static</source> - </trans-unit> - <trans-unit id="_.image"> - <source>EXT:context_help/Resources/Public/Images/cshimages/static.png</source> - <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note> - </trans-unit> - <trans-unit id=".image_descr"> - <source>The static templates are located in the page tree root where only the Admin users can access them. However they are read-only by default so you can only look at their content, not change it.</source> - </trans-unit> - <trans-unit id="title.description"> - <source>Template Title. Will be visible in the list of static templates in Template Records</source> - </trans-unit> - <trans-unit id="constants.description"> - <source>TypoScript Constants field</source> - </trans-unit> - <trans-unit id="_constants.seeAlso"> - <source>sys_template:constants</source> - <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note> - </trans-unit> - <trans-unit id="config.description"> - <source>TypoScript Setup code field</source> - </trans-unit> - <trans-unit id="_config.seeAlso"> - <source>sys_template:config</source> - <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note> - </trans-unit> - <trans-unit id="include_static.description"> - <source>Inclusion of other static templates</source> - </trans-unit> - <trans-unit id="description.description"> - <source>Description of the static template record.</source> - </trans-unit> - <trans-unit id="editorcfg.description"> - <source>Editor Configuration - used to configure Stylesheet editor.</source> - </trans-unit> - </body> - </file> -</xliff> diff --git a/typo3/sysext/context_help/Resources/Private/Language/locallang_csh_systmpl.xlf b/typo3/sysext/context_help/Resources/Private/Language/locallang_csh_systmpl.xlf deleted file mode 100644 index 6c7da86ffe0b..000000000000 --- a/typo3/sysext/context_help/Resources/Private/Language/locallang_csh_systmpl.xlf +++ /dev/null @@ -1,136 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff"> - <file t3:id="1415814802" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:32Z" product-name="context_help"> - <header/> - <body> - <trans-unit id=".description"> - <source>TypoScript template record.</source> - </trans-unit> - <trans-unit id=".details" xml:space="preserve"> - <source>The 'Template' records are the vital components used to set the design of the webpages. No matter how (almost) you would like to build your website, it must be initiated by a 'Template' record placed in the root of the page tree of the site. -Basically, create a 'Template' record, enter a title and make sure to check of Clear constants, setup and Rootline. Then enter some TypoScript configuration in the Setup field and you're set. -It's very important to read how to do all this in the documents listed below! Also make sure you use the Web>Template module to do all the working with templates. It's a specialized tool to help you with this.</source> - </trans-unit> - <trans-unit id="_.seeAlso" xml:space="preserve"> - <source>static_template -TSref | https://docs.typo3.org/typo3cms/TyposcriptReference/ -TypoScript in 45 min| https://docs.typo3.org/typo3cms/TyposcriptIn45MinutesTutorial/</source> - </trans-unit> - <trans-unit id="_.image" xml:space="preserve"> - <source>EXT:context_help/Resources/Public/Images/cshimages/systemplate.png, -EXT:context_help/Resources/Public/Images/cshimages/systemplate1.png</source> - <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note> - </trans-unit> - <trans-unit id=".image_descr" xml:space="preserve"> - <source>A Template Record with constants and setup code. -The Web>Template module contains tools which will help you to edit and validate TypoScript structures.</source> - </trans-unit> - <trans-unit id="hidden.description"> - <source>Hiding the template will deactivate the template record.</source> - </trans-unit> - <trans-unit id="hidden.details"> - <source>If the Template Record was the first record on a page hiding it will expose the second record on the page instead.</source> - </trans-unit> - <trans-unit id="starttime.description"> - <source>Start time. Use this to enable a template on a certain date.</source> - </trans-unit> - <trans-unit id="endtime.description"> - <source>End time. Use this to disable a template on a certain date.</source> - </trans-unit> - <trans-unit id="title.description"> - <source>The title of the template record is only an internal label and does not have any effect on the output in the frontend.</source> - </trans-unit> - <trans-unit id="sitetitle.description"> - <source>Website title. Typically this will automatically be prefixed all page titles in the <title> tag of the frontend pages.</source> - </trans-unit> - <trans-unit id="constants.description"> - <source>TypoScript Constants.</source> - </trans-unit> - <trans-unit id="_constants.seeAlso"> - <source>static_template:constants</source> - <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note> - </trans-unit> - <trans-unit id="config.description"> - <source>TypoScript Setup code</source> - </trans-unit> - <trans-unit id="config.details"> - <source>Read more about TypoScript Templates in TSref, TypoScript by Example and Getting Started.</source> - </trans-unit> - <trans-unit id="_config.seeAlso" xml:space="preserve"> - <source>static_template:config, -TSref | https://docs.typo3.org/typo3cms/TyposcriptReference/ -Getting Started | https://docs.typo3.org/typo3cms/GettingStartedTutorial/ -TypoScript in 45 min| https://docs.typo3.org/typo3cms/TyposcriptIn45MinutesTutorial/ -TypoScript Syntax | https://docs.typo3.org/typo3cms/TyposcriptSyntaxReference/</source> - <note from="developer">A part of this string is an internal text, which must not be changed. Just copy this part into the translation field and do not change it. For more information have a look at the Tutorial.</note> - </trans-unit> - <trans-unit id="resources.description"> - <source>Resource files for the template. For example a logo, a TTF-font etc.</source> - </trans-unit> - <trans-unit id="resources.details"> - <source>Resource files can be referenced in TypoScript Template code by [filename]*.[ext] and has the advantage that the reference from TypoScript is not broken if you copy or export a Template Record where the resources ends up with new names.</source> - </trans-unit> - <trans-unit id="clear.description"> - <source>Flags that will clear the inheritance of TypoScript code from former templates in the root line. There is a flag for Constants and one for Setup code.</source> - </trans-unit> - <trans-unit id="clear.details"> - <source>In the Web > Template / Template Analyser module you can see how far back in the template tree that constants and setup code is inherited.</source> - </trans-unit> - <trans-unit id="_clear.seeAlso"> - <source>sys_template:root</source> - <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note> - </trans-unit> - <trans-unit id="_clear.image"> - <source>EXT:context_help/Resources/Public/Images/cshimages/systemplate2.png</source> - <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note> - </trans-unit> - <trans-unit id="root.description"> - <source>Defines that the template represents a root of a website.</source> - </trans-unit> - <trans-unit id="_root.seeAlso"> - <source>sys_template:clear</source> - <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note> - </trans-unit> - <trans-unit id="includeStaticAfterBasedOn.description"> - <source>If set, static templates will be included after "based-on" templates. It basically swaps the order of inclusion of these external TypoScript sources.</source> - </trans-unit> - <trans-unit id="includeStaticAfterBasedOn.details"> - <source>The Web > Template / Template Analyser module allows you to view the order of inclusion of all TypoScript sources your template uses.</source> - </trans-unit> - <trans-unit id="include_static.description"> - <source>Static Template records to include.</source> - </trans-unit> - <trans-unit id="_include_static.seeAlso"> - <source>static_template</source> - </trans-unit> - <trans-unit id="include_static_file.description"> - <source>Static Template files to include.</source> - </trans-unit> - <trans-unit id="include_static_file.details"> - <source>Static template files are registered by extensions contrary to Static Template records which come from the static database table, "static_template".</source> - </trans-unit> - <trans-unit id="_include_static_file.seeAlso"> - <source>sys_template:include_static</source> - <note from="developer">This string contains an internal text, which must not be changed. Just copy the original text into the translation field. For more information have a look at the Tutorial.</note> - </trans-unit> - <trans-unit id="basedOn.description"> - <source>Other Template Records that are included like "static templates".</source> - </trans-unit> - <trans-unit id="static_file_mode.description"> - <source>Define the mode of inclusion of static template files.</source> - </trans-unit> - <trans-unit id="static_file_mode.details"> - <source>If you are in doubt about the inclusion order, make sure to use the Web > Template / Template Analyser to view the order.</source> - </trans-unit> - <trans-unit id="nextLevel.description"> - <source>Defines a template record to make active one level out in the page tree of this branch. This can be used to define another template record for the general website while having a special template for the frontpage.</source> - </trans-unit> - <trans-unit id="description.description"> - <source>Enter a description of the template if you like.</source> - </trans-unit> - <trans-unit id="editorcfg.description"> - <source>Editor Configuration for the stylesheet editor extension.</source> - </trans-unit> - </body> - </file> -</xliff> diff --git a/typo3/sysext/context_help/Resources/Public/Images/cshimages/static.png b/typo3/sysext/context_help/Resources/Public/Images/cshimages/static.png deleted file mode 100644 index 575cd6bad20b67b434ad69817c10fdf038d02b7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5674 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 KwaOmbeE1*0Z>doL diff --git a/typo3/sysext/context_help/ext_tables.php b/typo3/sysext/context_help/ext_tables.php index 13298bdefe7e..84e01ef0b10e 100644 --- a/typo3/sysext/context_help/ext_tables.php +++ b/typo3/sysext/context_help/ext_tables.php @@ -5,7 +5,6 @@ defined('TYPO3_MODE') or die(); \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('fe_users', 'EXT:context_help/Resources/Private/Language/locallang_csh_fe_users.xlf'); \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('pages', 'EXT:context_help/Resources/Private/Language/locallang_csh_pages.xlf'); \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('pages_language_overlay', 'EXT:context_help/Resources/Private/Language/locallang_csh_pageslol.xlf'); -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('static_template', 'EXT:context_help/Resources/Private/Language/locallang_csh_statictpl.xlf'); \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('sys_domain', 'EXT:context_help/Resources/Private/Language/locallang_csh_sysdomain.xlf'); \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('sys_file_storage', 'EXT:context_help/Resources/Private/Language/locallang_csh_sysfilestorage.xlf'); \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('sys_template', 'EXT:context_help/Resources/Private/Language/locallang_csh_systmpl.xlf'); diff --git a/typo3/sysext/core/Classes/TypoScript/TemplateService.php b/typo3/sysext/core/Classes/TypoScript/TemplateService.php index 02fffbf44ce0..7439c324c1a3 100644 --- a/typo3/sysext/core/Classes/TypoScript/TemplateService.php +++ b/typo3/sysext/core/Classes/TypoScript/TemplateService.php @@ -686,8 +686,8 @@ class TemplateService * Checks if the template ($row) has some included templates and after including them it fills the arrays with the setup * Builds up $this->rowSum * - * @param array $row A full TypoScript template record (sys_template/static_template/forged "dummy" record made from static template file) - * @param string $idList A list of already processed template ids including the current; The list is on the form "[prefix]_[uid]" where [prefix] is "sys" for "sys_template" records, "static" for "static_template" records and "ext_" for static include files (from extensions). The list is used to check that the recursive inclusion of templates does not go into circles: Simply it is used to NOT include a template record/file which has already BEEN included somewhere in the recursion. + * @param array $row A full TypoScript template record (sys_template/forged "dummy" record made from static template file) + * @param string $idList A list of already processed template ids including the current; The list is on the form "[prefix]_[uid]" where [prefix] is "sys" for "sys_template" records, records and "ext_" for static include files (from extensions). The list is used to check that the recursive inclusion of templates does not go into circles: Simply it is used to NOT include a template record/file which has already BEEN included somewhere in the recursion. * @param int $pid The PID of the input template record * @param string $templateID The id of the current template. Same syntax as $idList ids, eg. "sys_123 * @param string $templateParent Parent template id (during recursive call); Same syntax as $idList ids, eg. "sys_123 @@ -722,7 +722,7 @@ class TemplateService $this->clearList_setup = []; } } - // Include static records (static_template) or files (from extensions) (#1/2) + // Include files (from extensions) (#1/2) // NORMAL inclusion, The EXACT same code is found below the basedOn inclusion!!! if (!$row['includeStaticAfterBasedOn']) { $this->includeStaticTypoScriptSources($idList, $templateID, $pid, $row); @@ -766,7 +766,7 @@ class TemplateService } } } - // Include static records (static_template) or files (from extensions) (#2/2) + // Include files (from extensions) (#2/2) if ($row['includeStaticAfterBasedOn']) { $this->includeStaticTypoScriptSources($idList, $templateID, $pid, $row); } @@ -839,9 +839,9 @@ class TemplateService } /** - * Includes static template records (from static_template table, loaded through a hook) and static template files (from extensions) for the input template record row. + * Includes static template files (from extensions) for the input template record row. * - * @param string $idList A list of already processed template ids including the current; The list is on the form "[prefix]_[uid]" where [prefix] is "sys" for "sys_template" records, "static" for "static_template" records and "ext_" for static include files (from extensions). The list is used to check that the recursive inclusion of templates does not go into circles: Simply it is used to NOT include a template record/file which has already BEEN included somewhere in the recursion. + * @param string $idList A list of already processed template ids including the current; The list is on the form "[prefix]_[uid]" where [prefix] is "sys" for "sys_template" records and "ext_" for static include files (from extensions). The list is used to check that the recursive inclusion of templates does not go into circles: Simply it is used to NOT include a template record/file which has already BEEN included somewhere in the recursion. * @param string $templateID The id of the current template. Same syntax as $idList ids, eg. "sys_123 * @param int $pid The PID of the input template record * @param array $row A full TypoScript template record @@ -849,7 +849,6 @@ class TemplateService */ public function includeStaticTypoScriptSources($idList, $templateID, $pid, $row) { - // Static Template Records (static_template): include_static is a list of static templates to include // Call function for link rendering: if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tstemplate.php']['includeStaticTypoScriptSources'])) { $_params = [ @@ -935,7 +934,7 @@ class TemplateService /** * Adds the default TypoScript files for extensions if any. * - * @param string $idList A list of already processed template ids including the current; The list is on the form "[prefix]_[uid]" where [prefix] is "sys" for "sys_template" records, "static" for "static_template" records and "ext_" for static include files (from extensions). The list is used to check that the recursive inclusion of templates does not go into circles: Simply it is used to NOT include a template record/file which has already BEEN included somewhere in the recursion. + * @param string $idList A list of already processed template ids including the current; The list is on the form "[prefix]_[uid]" where [prefix] is "sys" for "sys_template" records and "ext_" for static include files (from extensions). The list is used to check that the recursive inclusion of templates does not go into circles: Simply it is used to NOT include a template record/file which has already BEEN included somewhere in the recursion. * @param string $templateID The id of the current template. Same syntax as $idList ids, eg. "sys_123 * @param int $pid The PID of the input template record * @param array $row A full TypoScript template record @@ -965,7 +964,6 @@ class TemplateService /** * Appends (not prepends) additional TypoScript code to static template records/files as set in TYPO3_CONF_VARS - * For DB records the "uid" value is the integer of the "static_template" record. * For files the "uid" value is the extension key but with any underscores removed. Possibly with a path if its a static file selected in the template record * * @param array $subrow Static template record/file diff --git a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php index c1f93738678d..c57e464fbfed 100644 --- a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php +++ b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php @@ -1298,7 +1298,7 @@ tt_content.' . $key . $suffix . ' { * FOR USE IN Configuration/TCA/Overrides/sys_template.php Use in ext_tables.php may break the frontend. * * @param string $extKey Is of course the extension key - * @param string $path Is the path where the template files (fixed names) include_static.txt (integer list of uids from the table "static_templates"), constants.txt, setup.txt, and include_static_file.txt is found (relative to extPath, eg. 'static/'). The file include_static_file.txt, allows you to include other static templates defined in files, from your static template, and thus corresponds to the field 'include_static_file' in the sys_template table. The syntax for this is a comma separated list of static templates to include, like: EXT:fluid_styled_content/Configuration/TypoScript/,EXT:da_newsletter_subscription/static/,EXT:cc_random_image/pi2/static/ + * @param string $path Is the path where the template files (fixed names) include_static.txt, constants.txt, setup.txt, and include_static_file.txt is found (relative to extPath, eg. 'static/'). The file include_static_file.txt, allows you to include other static templates defined in files, from your static template, and thus corresponds to the field 'include_static_file' in the sys_template table. The syntax for this is a comma separated list of static templates to include, like: EXT:fluid_styled_content/Configuration/TypoScript/,EXT:da_newsletter_subscription/static/,EXT:cc_random_image/pi2/static/ * @param string $title Is the title in the selector box. * @see addTypoScript() */ @@ -1378,7 +1378,7 @@ tt_content.' . $key . $suffix . ' { * @param string $key Is the extension key (informative only). * @param string $type Is either "setup" or "constants" and obviously determines which kind of TypoScript code we are adding. * @param string $content Is the TS content, will be prefixed with a [GLOBAL] line and a comment-header. - * @param int|string $afterStaticUid Is either an integer pointing to a uid of a static_template or a string pointing to the "key" of a static_file template ([reduced extension_key]/[local path]). The points is that the TypoScript you add is included only IF that static template is included (and in that case, right after). So effectively the TypoScript you set can specifically overrule settings from those static templates. + * @param int|string string pointing to the "key" of a static_file template ([reduced extension_key]/[local path]). The points is that the TypoScript you add is included only IF that static template is included (and in that case, right after). So effectively the TypoScript you set can specifically overrule settings from those static templates. */ public static function addTypoScript($key, $type, $content, $afterStaticUid = 0) { diff --git a/typo3/sysext/frontend/Classes/Controller/PageInformationController.php b/typo3/sysext/frontend/Classes/Controller/PageInformationController.php index 7a0232ed06ca..c9cada6bd5e9 100644 --- a/typo3/sysext/frontend/Classes/Controller/PageInformationController.php +++ b/typo3/sysext/frontend/Classes/Controller/PageInformationController.php @@ -126,7 +126,7 @@ class PageInformationController extends \TYPO3\CMS\Backend\Module\AbstractFuncti /** * Function, which fills in the internal array, $this->allowedTableNames with all tables to - * which the user has access. Also a set of standard tables (pages, static_template, sys_filemounts, etc...) + * which the user has access. Also a set of standard tables (pages, sys_filemounts, etc...) * are filtered out. So what is left is basically all tables which makes sense to list content from. * * @return string[] @@ -137,7 +137,6 @@ class PageInformationController extends \TYPO3\CMS\Backend\Module\AbstractFuncti $tableNames = array_flip(array_keys($GLOBALS['TCA'])); // Unset common names: unset($tableNames['pages']); - unset($tableNames['static_template']); unset($tableNames['sys_filemounts']); unset($tableNames['sys_action']); unset($tableNames['sys_workflows']); diff --git a/typo3/sysext/t3editor/Resources/Private/tsref.xml b/typo3/sysext/t3editor/Resources/Private/tsref.xml index 26be888894a9..1b037ab69da7 100644 --- a/typo3/sysext/t3editor/Resources/Private/tsref.xml +++ b/typo3/sysext/t3editor/Resources/Private/tsref.xml @@ -2856,7 +2856,7 @@ If this is true, RO becomes a GIFBUILDER-object defining the layout of the menui Example: This is useful it you want to create a menu with individual items but a common background image that extends to the whole area behind the menu. Then you should setup the background image in each GIFBUILDER-object and include the object-number in this list. -Look at the implementation in static_template "styles.gmenu.bug"]]></description> +]]></description> <default><![CDATA[ ]]></default> </property> @@ -3422,8 +3422,6 @@ In the example below, the text of each menuitem is rendered by letting the title <property name="distrib" type="string"> <description><![CDATA[.distrib is (x,y,v,h +calc) of the distribution of the menuitems. This provides a way to space each item from the other. The codes "textX" and "textY" can be used for the width (X) and height (Y) dimension of each link. This works by adding a WORKAREA-GifBuilderObj between each of the IMGMENUITEM ("subset" of a GIFBUILDER-object) and this workarea defines where the text should be printed. As such the "x,y" defines the offset the next item will have (this should be the width of the previous in many cases!) and "v,h" defines the dimensions of the current item. -Consider this example taken from the static_template "template: MM": -Â Â NO.distrib = textX+10, 0, textX+10, textY+5 In the future TypoScript may provide better ways to position GIFBUILDER-objects on the image-maps! ]]></description> <default><![CDATA[ ]]></default> @@ -4332,7 +4330,7 @@ Please note that this value will override the properties "width", "maxH", "maxW" <description><![CDATA[Frames: .key points to the frame used. -".image_frames.x" is imgResource-mask (".m")properties which will override to the [imgResource].m properties of the imageObjects. This is used to mask the images into a frame. See how it's done in the default configuration and IMGTEXT in the static_template-table. +".image_frames.x" is imgResource-mask (".m")properties which will override to the [imgResource].m properties of the imageObjects. This is used to mask the images into a frame. Example: 1 { -- GitLab