Fixed bug #15294: treeFilterReset disappears + minor optimization (Thanks to Felix...
authorSteffen Gebert <steffen.gebert@typo3.org>
Sun, 29 Aug 2010 10:41:49 +0000 (10:41 +0000)
committerSteffen Gebert <steffen.gebert@typo3.org>
Sun, 29 Aug 2010 10:41:49 +0000 (10:41 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/branches/TYPO3_4-4@8725 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/alt_db_navframe.php
typo3/js/pagetreefiltermenu.js
typo3/sysext/t3skin/stylesheets/structure/element_tree.css

index b8ce0b6..6ba3c07 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-29  Steffen Gebert  <steffen@steffen-gebert.de>
+
+       * Fixed bug #15294: treeFilterReset disappears + minor optimization (Thanks to Felix Kopp)
+
 2010-08-28  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Updated htmlArea RTE version to 2.0.4
index b5ccd2c..6859497 100644 (file)
@@ -161,7 +161,9 @@ class SC_alt_db_navframe {
                $this->doc->getPageRenderer()->loadScriptaculous('effects');
                $this->doc->getPageRenderer()->loadExtJS();
 
-               $this->doc->getPageRenderer()->addJsFile('js/pagetreefiltermenu.js');
+               if ($this->hasFilterBox) {
+                       $this->doc->getPageRenderer()->addJsFile('js/pagetreefiltermenu.js');
+               }
 
                $this->doc->JScode .= $this->doc->wrapScriptTags(
                ($this->currentSubScript?'top.currentSubScript=unescape("'.rawurlencode($this->currentSubScript).'");':'').'
index 36b0927..5a2d196 100644 (file)
@@ -53,7 +53,7 @@ var PagetreeFilterMenu = Class.create({
 
                if (toolbarItem.hasClass('active')) {
                        treeFilterBox.fadeOut();
-                       treeFilterReset.fadeOut();
+                       TYPO3PageTreeFilter.resetSearchField();
                } else {
                        treeFilterBox.fadeIn();
                        treeFilterItem.focus();
index 54fcb63..560fb33 100644 (file)
@@ -124,13 +124,13 @@ ul.tree div.treeLinkItem span.dragIcon {
 #treeFilter {
        margin: 6px 0 0 17px !important;
        height: 16px;
-       width: 165px;
+       width: 160px;
 }
 
 #treeFilterReset {
-       left: 189px;
+       left: 192px;
        position: absolute;
-       top: 4px;
+       top: 5px;
        visibility: hidden;
 }