Fixed Bug #4662: New default behaviour for PAGE_TARGET (Thanks to Steffen Kemper)

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@2625 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index abdc1b8..b3c749f 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-27  Benjamin Mack  <mack@xnos.org>
+
+       * Fixed Bug #4662: New default behaviour for PAGE_TARGET (Thanks to Steffen Kemper)
+
 2007-10-27  Ingmar Schlecht  <ingmar@typo3.org>
 
        * Fixed bug #1940: "OPEN DOCUMENTS" causes 404 error (Thanks to Christian Trabold)

diff --git a/typo3/sysext/css_styled_content/ext_localconf.php b/typo3/sysext/css_styled_content/ext_localconf.php
index ca2e179..23da61e 100755 (executable)
--- a/typo3/sysext/css_styled_content/ext_localconf.php
+++ b/typo3/sysext/css_styled_content/ext_localconf.php
@@ -24,6 +24,11 @@ $TYPO3_CONF_VARS['SC_OPTIONS']['ext/install']['compat_version']['tx_cssstyledcon
                                <li><b>CSS based "image" and "text with image"</b><br />As the extension cron_cssstyledimgtext has been merged into the core, rendering of the content elements "image" and "text with image" has been changed to be CSS instead of table based. Read the <a href="http://wiki.typo3.org/index.php/TYPO3_4.0" target="_blank">4.0 release notes</a> for further information.</li></ul>',
        'description_acknowledge' => 'You will have to update your stylesheets to comply with these changes.'
 );
+$TYPO3_CONF_VARS['SC_OPTIONS']['ext/install']['compat_version']['tx_cssstyledcontent_pagetargets'] = array(
+       'title' => 'CSS Styled Content: Default targets for non-frame pages',
+       'version' => 4002000,
+       'description' => '<p>The default page target is empty (so no target is generated). If you use frames, you have to set target to "page" in Constants.</p>'
+);
 
 
 ?>
\ No newline at end of file

diff --git a/typo3/sysext/css_styled_content/static/constants.txt b/typo3/sysext/css_styled_content/static/constants.txt
index 4e31535..6e7f5b9 100755 (executable)
--- a/typo3/sysext/css_styled_content/static/constants.txt
+++ b/typo3/sysext/css_styled_content/static/constants.txt
@@ -97,6 +97,15 @@ styles.content.searchresult {
   # cat=advanced/links; type=small; label= Target for internal links: Should match the name of the content PAGE-object in TypoScript when used with frames. Most cases: Set to "page" if you have frames in the template. If not, set to "" (empty)
 PAGE_TARGET = page
 
+[compatVersion = 4.2.0]
+  
+  # cat=advanced/links; type=small; label= Target for internal links: Should match the name of the content PAGE-object in TypoScript when used with frames. Most cases: set to "" (empty). If you have frames in the template set to "page" 
+PAGE_TARGET =
+
+content.pageFrameObj >
+[end]
+
+
 [compatVersion = 3.9.0]
 
 styles.content.imgtext >

diff --git a/typo3/sysext/css_styled_content/static/setup.txt b/typo3/sysext/css_styled_content/static/setup.txt
index b2d83b1..2a8251b 100755 (executable)
--- a/typo3/sysext/css_styled_content/static/setup.txt
+++ b/typo3/sysext/css_styled_content/static/setup.txt
@@ -995,6 +995,11 @@ tt_content.menu {
        }
 }
 
+# Match TYPO3 4.2.0 and later
+[compatVersion = 4.2.0]
+tt_content.menu.20.default.1.target = {$PAGE_TARGET}
+tt_content.menu.20.2.1.target = {$PAGE_TARGET}
+[end]
 
 # ****************
 # CType: shortcut