Removed the tree filter toggle

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

diff --git a/ChangeLog b/ChangeLog
index d1ef4a8..0522d03 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,6 +37,7 @@
        * Fixed bug #7203: Hook cObjTypeAndClassDefault in tslib_content somtimes fails, credits Stefan Geith
        * Added feature #4923: provide new inputfield "directorypicker" in BE, credits Andreas Wolf and Ralf Hettinger
        * Clean up: formatted typo3/stylesheet.css
+       * Removed the tree filter toggle
 
 2008-03-03  Dmitry Dulepov  <dmitry@typo3.org>
 

diff --git a/t3lib/config_default.php b/t3lib/config_default.php
index 3e33b52..34acf24 100755 (executable)
--- a/t3lib/config_default.php
+++ b/t3lib/config_default.php
@@ -181,7 +181,6 @@ $TYPO3_CONF_VARS = Array(
                'elementVersioningOnly' => FALSE,               // If true, only element versioning is allowed in the backend. This is recommended for new installations of TYPO3 4.2+ since "page" and "branch" versioning types are known for the drawbacks of loosing ids and "element" type versions supports moving now.
                'AJAX' => array(                                // array of key-value pairs for a unified use of AJAX calls in the TYPO3 backend. Keys are the unique ajaxIDs where the value will be resolved to call a method in an object. See ajax.php and the classes/class.typo3ajax.php for more information.
                        'SC_alt_db_navframe::expandCollapse'                => 'typo3/alt_db_navframe.php:SC_alt_db_navframe->ajaxExpandCollapse',
-                       'SC_alt_db_navframe::saveFilterboxStatus'           => 'typo3/alt_db_navframe.php:SC_alt_db_navframe->ajaxSaveFilterboxStatus',
                        'SC_alt_file_navframe::expandCollapse'              => 'typo3/alt_file_navframe.php:SC_alt_file_navframe->ajaxExpandCollapse',
                        't3lib_TCEforms_inline::createNewRecord'                    => 't3lib/class.t3lib_tceforms_inline.php:t3lib_TCEforms_inline->processAjaxRequest',
                        't3lib_TCEforms_inline::synchronizeLocalizeRecords'     => 't3lib/class.t3lib_tceforms_inline.php:t3lib_TCEforms_inline->processAjaxRequest',

diff --git a/typo3/alt_db_navframe.php b/typo3/alt_db_navframe.php
index 1d0b4e5..a9db349 100755 (executable)
--- a/typo3/alt_db_navframe.php
+++ b/typo3/alt_db_navframe.php
@@ -223,9 +223,7 @@ class SC_alt_db_navframe {
 
                        // Setting up the buttons and markers for docheader
                $docHeaderButtons = $this->getButtons();
-               $docHeaderButtons['filtertoggle'] = $this->getFilterToggle();
                $markers = array(
-                       'STYLE' => $GLOBALS['BE_USER']->uc['moduleData']['pageTree']['filterBox'] ? ' style="display:none;"' : '',
                        'IMG_RESET' => '<img'.t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'], 'gfx/close_gray.gif', ' width="16" height="16"').' id="treeFilterReset" alt="Reset Filter" />',
                        'WORKSPACEINFO' => $this->getWorkspaceInfo(),
                        'CONTENT' => $this->content
@@ -307,27 +305,6 @@ class SC_alt_db_navframe {
                return $workspaceInfo;
        }
 
-       /**
-        * Create the filter toggle
-        *
-        * @return      string  HTML for filter toggle
-        */
-       private function getFilterToggle() {
-               $filterToggle = '';
-
-               if($this->hasFilterBox) {
-                       $filterToggle = '
-                               <a href="#" id="toggleTreeFilter">
-                                       <img' . t3lib_iconWorks::skinImg('', $GLOBALS['BE_USER']->uc['moduleData']['pageTree']['filterBox'] ? 'gfx/arrowright.png' : 'gfx/arrowdown.png') . ' title="toggle filter" alt="" />
-                                       <span>' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_misc.xml:pageTree_filter', 1) . '</span>
-                               </a>
-                       ';
-               }
-
-               return $filterToggle;
-       }
-
-
 
        /**********************************
         *
@@ -405,22 +382,6 @@ class SC_alt_db_navframe {
                        $ajaxObj->addContent('tree', $tree);
                }
        }
-
-       /**
-        * Makes the AJAX call to expand or collapse the filterbox.
-        * Called by typo3/ajax.php
-        *
-        * @param       array           $params: additional parameters (not used here)
-        * @param       TYPO3AJAX       &$ajaxObj: reference of the TYPO3AJAX object of this request
-        * @return      void
-        */
-       public function ajaxSaveFilterboxStatus(array $params, &$ajaxObj) {
-               $state = t3lib_div::_POST('state') === 'true' ? 1 : 0;
-
-               $GLOBALS['BE_USER']->uc['moduleData']['pageTree']['filterBox'] = $state;
-               $GLOBALS['BE_USER']->writeUC();
-       }
-
 }
 
 

diff --git a/typo3/js/tree.js b/typo3/js/tree.js
index 603aca5..8da15e8 100644 (file)
--- a/typo3/js/tree.js
+++ b/typo3/js/tree.js
@@ -214,7 +214,6 @@ var DragDrop = {
 var PageTreeFilter = Class.create({
        field: 'treeFilter',
        resetfield: 'treeFilterReset',
-       togglelink: 'toggleTreeFilter',
 
        /**
         * constructor with event listener
@@ -224,37 +223,10 @@ var PageTreeFilter = Class.create({
                Event.observe(document, 'dom:loaded', function(){
                        Event.observe(this.field, "keyup", this.filter.bindAsEventListener(this));
                        Event.observe(this.resetfield, "click", this.resetSearchField.bindAsEventListener(this) );
-
-                       this.toggleFilterBoxIcon = $$('#toggleTreeFilter img')[0];
-                       Event.observe(this.togglelink, "click", this.toggleFilter.bindAsEventListener(this) );
                }.bind(this));
        },
 
        /**
-        * Toggles visability of the filter box
-        */
-       toggleFilter: function() {
-               var filterBox = $('typo3-docheader-row2');
-               var state     = filterBox.visible();
-
-                       // save state
-               new Ajax.Request('ajax.php', {
-                       parameters : 'ajaxID=SC_alt_db_navframe::saveFilterboxStatus&state=' + state
-               });
-
-               if (state) {
-                       Effect.BlindUp(filterBox, {duration : 0.2});
-                       this.toggleFilterBoxIcon.src = 'gfx/arrowright.png';
-                       this.resetSearchField();
-               } else {
-                       Effect.BlindDown(filterBox, {duration : 0.1});
-                       this.toggleFilterBoxIcon.src = 'gfx/arrowdown.png';
-               }
-       },
-
-
-
-       /**
         * Filters the tree by setting a class on items not matching search input string
         * tested in FF2, S3, IE6, IE7
         */
@@ -273,7 +245,6 @@ var PageTreeFilter = Class.create({
 
        },
 
-
        /**
         * toggles the visibility of the reset button
         */

diff --git a/typo3/stylesheet.css b/typo3/stylesheet.css
index 7f3c280..883ee17 100755 (executable)
--- a/typo3/stylesheet.css
+++ b/typo3/stylesheet.css
@@ -904,21 +904,6 @@ ul.tree li.active ul, ul.tree ul li.active ul {
        visibility: hidden;
 }
 
-#toggleTreeFilter span {
-       font-weight: bold;
-       margin: 4px 0 0 -4px;
-       font-size: 12px;
-}
-
-#toggleTreeFilter img {
-       vertical-align: middle;
-}
-
-#toggleTreeFilter {
-       outline: none;
-       text-decoration: none;
-}
-
 #typo3-pagetree #typo3-docheader img {
        margin: 2px 1px;
 }

diff --git a/typo3/templates/alt_db_navframe.html b/typo3/templates/alt_db_navframe.html
index 696a675..f816b51 100644 (file)
--- a/typo3/templates/alt_db_navframe.html
+++ b/typo3/templates/alt_db_navframe.html
@@ -4,10 +4,10 @@
        <div id="typo3-docheader">
                <div id="typo3-docheader-row1">
                        <div class="buttonsleft">###BUTTONLIST_LEFT###</div>
-                       <div class="buttonsright">###BUTTONLIST_RIGHT###</div>
+                       <div class="buttonsright no-border">###BUTTONLIST_RIGHT###</div>
                </div>
                <div id="typo3-docheader-row2">
-                       <div id="treeFilterBox" class="bgColor4" ###STYLE###>
+                       <div id="treeFilterBox" class="bgColor4">
                                <div id="searchBubble">
                                        <input type="text" value="" name="treeFilter" id="treeFilter" />
                                        ###IMG_RESET###
@@ -30,7 +30,7 @@
 <!-- ###BUTTON_GROUP_WRAP### -->
 
 <!-- ###BUTTON_GROUPS_LEFT### -->
-<!-- ###BUTTON_GROUP4### -->###FILTERTOGGLE###<!-- ###BUTTON_GROUP4### -->
+<!-- ###BUTTON_GROUP4### --> <!-- ###BUTTON_GROUP4### -->
 <!-- ###BUTTON_GROUPS_LEFT### -->
 
 <!-- ###BUTTON_GROUPS_RIGHT### -->