fixed bug #7816: New page icon does not honor a selected page, credits Steffen Kamper

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

diff --git a/ChangeLog b/ChangeLog
index 4e4805c..ec4e671 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-11  Ingo Renner  <ingo@typo3.org>
+
+       * fixed bug #7816: New page icon does not honor a selected page, credits Steffen Kamper
+
 2008-03-11  Jeff Segars  <jeff@webempoweredchurch.org>
 
        * Fixed bug #7794: opendocs causes Javascript error in Internet Explorer (thanks to Steffen Kamper)

diff --git a/typo3/alt_db_navframe.php b/typo3/alt_db_navframe.php
index a9db349..a9fba73 100755 (executable)
--- a/typo3/alt_db_navframe.php
+++ b/typo3/alt_db_navframe.php
@@ -260,7 +260,7 @@ class SC_alt_db_navframe {
                );
 
                        // New Page
-               $onclickNewPageWizard = 'top.content.list_frame.location.href=top.TS.PATH_typo3+\'db_new.php?id=1&pagesOnly=1\';"';
+               $onclickNewPageWizard = 'top.content.list_frame.location.href=top.TS.PATH_typo3+\'db_new.php?pagesOnly=1&id=\'+Tree.pageID;"';
                $buttons['new_page'] = '<a href="#" onclick="' . $onclickNewPageWizard . '"><img' . t3lib_iconWorks::skinImg('', 'gfx/new_page.gif') . ' title="' . $LANG->sL('LLL:EXT:cms/layout/locallang.xml:newPage', 1) . '" alt="" /></a>';
 
                        // Refresh

diff --git a/typo3/js/tree.js b/typo3/js/tree.js
index 8da15e8..6c05a28 100644 (file)
--- a/typo3/js/tree.js
+++ b/typo3/js/tree.js
@@ -36,6 +36,7 @@ var Tree = {
        frameSetModule: null,
        activateDragDrop: true,
        highlightClass: 'active',
+       pageID: 0,
 
        // reloads a part of the page tree (useful when "expand" / "collapse")
        load: function(params, isExpand, obj) {
@@ -104,13 +105,17 @@ var Tree = {
        // selects the activated item again, in case it collapsed and got expanded again
        reSelectActiveItem: function() {
                obj = $(top.fsMod.navFrameHighlightedID[this.frameSetModule]);
-               if (obj) Element.addClassName(obj, this.highlightClass);
+               if (obj) {
+                       Element.addClassName(obj, this.highlightClass);
+                       this.extractPageIdFromTreeItem(obj.id);
+               }
        },
 
        // highlights an active list item in the page tree and registers it to the top-frame
        // used when loading the page for the first time
        highlightActiveItem: function(frameSetModule, highlightID) {
                this.frameSetModule = frameSetModule;
+               this.extractPageIdFromTreeItem(highlightID);
 
                // Remove all items that are already highlighted
                obj = $(top.fsMod.navFrameHighlightedID[frameSetModule]);
@@ -123,6 +128,13 @@ var Tree = {
                // Set the new item
                top.fsMod.navFrameHighlightedID[frameSetModule] = highlightID;
                if ($(highlightID)) Element.addClassName(highlightID, this.highlightClass);
+       },
+
+       //extract pageID from the given id (pagesxxx_y_z where xxx is the ID)
+       extractPageIdFromTreeItem: function(highlightID) {
+               if(highlightID) {
+                       this.pageID = highlightID.split('_')[0].substring(5);
+               }
        }
 };