diff --git a/typo3/sysext/backend/Classes/Template/DocumentTemplate.php b/typo3/sysext/backend/Classes/Template/DocumentTemplate.php index 349e5b486aa04f75a0e23c15670c2b672c0fdf68..7235e9548c1432d5bba739ed86003e7977f5bfeb 100644 --- a/typo3/sysext/backend/Classes/Template/DocumentTemplate.php +++ b/typo3/sysext/backend/Classes/Template/DocumentTemplate.php @@ -1744,17 +1744,16 @@ class DocumentTemplate { if ($isEmpty && $dividers2tabs == 1) { continue; } - $mouseOverOut = ' onmouseover="DTM_mouseOver(this);" onmouseout="DTM_mouseOut(this);"'; $requiredIcon = '<img name="' . $id . '-' . $index . '-REQ" src="' . $GLOBALS['BACK_PATH'] . 'gfx/clear.gif" class="t3-TCEforms-reqTabImg" alt="" />'; if (!$foldout) { // Create TAB cell: $options[$tabRows][] = ' - <td class="' . ($isEmpty ? 'disabled' : 'tab') . '" id="' . $id . '-' . $index . '-MENU"' . $noWrap . $mouseOverOut . '>' . ($isEmpty ? '' : '<a href="#" onclick="' . htmlspecialchars($onclick) . '"' . ($def['linkTitle'] ? ' title="' . htmlspecialchars($def['linkTitle']) . '"' : '') . '>') . $def['icon'] . ($def['label'] ? htmlspecialchars($def['label']) : ' ') . $requiredIcon . $this->icons($def['stateIcon'], 'margin-left: 10px;') . ($isEmpty ? '' : '</a>') . '</td>'; + <td class="' . ($isEmpty ? 'disabled' : 'tab') . '" id="' . $id . '-' . $index . '-MENU"' . $noWrap . '>' . ($isEmpty ? '' : '<a href="#" onclick="' . htmlspecialchars($onclick) . '"' . ($def['linkTitle'] ? ' title="' . htmlspecialchars($def['linkTitle']) . '"' : '') . '>') . $def['icon'] . ($def['label'] ? htmlspecialchars($def['label']) : ' ') . $requiredIcon . $this->icons($def['stateIcon'], 'margin-left: 10px;') . ($isEmpty ? '' : '</a>') . '</td>'; $titleLenCount += strlen($def['label']); } else { // Create DIV layer for content: $divs[] = ' - <div class="' . ($isEmpty ? 'disabled' : 'tab') . '" id="' . $id . '-' . $index . '-MENU"' . $mouseOverOut . '>' . ($isEmpty ? '' : '<a href="#" onclick="' . htmlspecialchars($onclick) . '"' . ($def['linkTitle'] ? ' title="' . htmlspecialchars($def['linkTitle']) . '"' : '') . '>') . $def['icon'] . ($def['label'] ? htmlspecialchars($def['label']) : ' ') . $requiredIcon . ($isEmpty ? '' : '</a>') . '</div>'; + <div class="' . ($isEmpty ? 'disabled' : 'tab') . '" id="' . $id . '-' . $index . '-MENU">' . ($isEmpty ? '' : '<a href="#" onclick="' . htmlspecialchars($onclick) . '"' . ($def['linkTitle'] ? ' title="' . htmlspecialchars($def['linkTitle']) . '"' : '') . '>') . $def['icon'] . ($def['label'] ? htmlspecialchars($def['label']) : ' ') . $requiredIcon . ($isEmpty ? '' : '</a>') . '</div>'; } // Create DIV layer for content: $divs[] = ' diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/tabmenu.js b/typo3/sysext/backend/Resources/Public/JavaScript/tabmenu.js index d036b49e7bc620970873813752e94d571af8e6d3..299666a11a535287d32113a431d54ff4cc09b8cb 100644 --- a/typo3/sysext/backend/Resources/Public/JavaScript/tabmenu.js +++ b/typo3/sysext/backend/Resources/Public/JavaScript/tabmenu.js @@ -21,8 +21,7 @@ * ***************************************************************/ -var DTM_array = DTM_array || [], - DTM_origClass = DTM_origClass || ''; +var DTM_array = DTM_array || []; // if tabs are used in a popup window the array might not exists if (!top.DTM_currentTabs) { @@ -47,19 +46,11 @@ function DTM_activate(idBase,index,doToogle) { if (document.getElementById(idBase+'-'+index+'-DIV')) { if (doToogle && document.getElementById(idBase+'-'+index+'-DIV').style.display === 'block') { document.getElementById(idBase+'-'+index+'-DIV').style.display = 'none'; - if (DTM_origClass === '') { - document.getElementById(idBase+'-'+index+'-MENU').attributes.getNamedItem('class').nodeValue = 'tab'; - } else { - DTM_origClass = 'tab'; - } + document.getElementById(idBase+'-'+index+'-MENU').attributes.getNamedItem('class').nodeValue = 'tab'; top.DTM_currentTabs[idBase] = -1; } else { document.getElementById(idBase+'-'+index+'-DIV').style.display = 'block'; - if (DTM_origClass === '') { - document.getElementById(idBase+'-'+index+'-MENU').attributes.getNamedItem('class').nodeValue = 'tabact'; - } else { - DTM_origClass = 'tabact'; - } + document.getElementById(idBase+'-'+index+'-MENU').attributes.getNamedItem('class').nodeValue = 'tabact'; top.DTM_currentTabs[idBase] = index; } } @@ -72,29 +63,14 @@ function DTM_toggle(idBase,index,isInit) { document.getElementById(idBase+'-'+index+'-DIV').style.display = 'none'; if (isInit) { document.getElementById(idBase+'-'+index+'-MENU').attributes.getNamedItem('class').nodeValue = 'tab'; - } else { - DTM_origClass = 'tab'; } top.DTM_currentTabs[idBase+'-'+index] = 0; } else { document.getElementById(idBase+'-'+index+'-DIV').style.display = 'block'; if (isInit) { document.getElementById(idBase+'-'+index+'-MENU').attributes.getNamedItem('class').nodeValue = 'tabact'; - } else { - DTM_origClass = 'tabact'; } top.DTM_currentTabs[idBase+'-'+index] = 1; } } } - -function DTM_mouseOver(obj) { - DTM_origClass = obj.attributes.getNamedItem('class').nodeValue; - obj.attributes.getNamedItem('class').nodeValue += '_over'; -} - -function DTM_mouseOut(obj) { - obj.attributes.getNamedItem('class').nodeValue = DTM_origClass; - DTM_origClass = ''; -} - diff --git a/typo3/sysext/t3skin/Resources/Public/Css/structure/element_tab.css b/typo3/sysext/t3skin/Resources/Public/Css/structure/element_tab.css index e97228496ce9720bfe43b2c72b8b5b3a1e21b806..5e581641779d3a0bb0356ea3da8022999e1e52c1 100644 --- a/typo3/sysext/t3skin/Resources/Public/Css/structure/element_tab.css +++ b/typo3/sysext/t3skin/Resources/Public/Css/structure/element_tab.css @@ -52,8 +52,7 @@ table.typo3-dyntabmenu td { padding: 0; } -table.typo3-dyntabmenu td.disabled, -table.typo3-dyntabmenu td.disabled_over { +table.typo3-dyntabmenu td.disabled { padding: 5px 10px 5px 10px; } @@ -66,14 +65,12 @@ table.typo3-dyntabmenu td a { } table.typo3-dyntabmenu td.tabact a, -table.typo3-dyntabmenu td.tabact_over a, -table#typo3-tabmenu td.tabact a, -table#typo3-tabmenu td.tabact_over a { +table#typo3-tabmenu td.tabact a { margin-top: 0px; } -table.typo3-dyntabmenu td.tab_over a, -table#typo3-tabmenu td.tab_over a { +table.typo3-dyntabmenu td.tab:hover a, +table#typo3-tabmenu td.tab:hover a { margin-top: 0px; } @@ -87,11 +84,8 @@ div.typo3-dyntabmenu-divs-foldout div.c-tablayer { } div.typo3-dyntabmenu-divs-foldout div.tab, -div.typo3-dyntabmenu-divs-foldout div.tab_over, div.typo3-dyntabmenu-divs-foldout div.tabact, -div.typo3-dyntabmenu-divs-foldout div.tabact_over, -div.typo3-dyntabmenu-divs-foldout div.disabled, -div.typo3-dyntabmenu-divs-foldout div.disabled_over { +div.typo3-dyntabmenu-divs-foldout div.disabled { margin-top: 5px; } @@ -99,14 +93,8 @@ div.typo3-dyntabmenu-divs-foldout div.disabled { padding: 2px 2px 2px 18px; } -div.typo3-dyntabmenu-divs-foldout div.disabled_over { - padding: 2px 2px 2px 18px; -} - div.typo3-dyntabmenu-divs-foldout div.tab a, -div.typo3-dyntabmenu-divs-foldout div.tabact a, -div.typo3-dyntabmenu-divs-foldout div.tab_over a, -div.typo3-dyntabmenu-divs-foldout div.tabact_over a { +div.typo3-dyntabmenu-divs-foldout div.tabact a { display: block; padding: 2px 2px 2px 18px; } \ No newline at end of file diff --git a/typo3/sysext/t3skin/Resources/Public/Css/visual/element_tab.css b/typo3/sysext/t3skin/Resources/Public/Css/visual/element_tab.css index 49687e28ec4bf5aa0be14f646b948d06e04cb720..2f40f8205830118769d94900278da20cd80f6cad 100644 --- a/typo3/sysext/t3skin/Resources/Public/Css/visual/element_tab.css +++ b/typo3/sysext/t3skin/Resources/Public/Css/visual/element_tab.css @@ -20,8 +20,7 @@ table#typo3-tabmenu td.disabled { } table.typo3-dyntabmenu td.tabact a, -table.typo3-dyntabmenu td.tab_over a, -table.typo3-dyntabmenu td.tabact_over a, +table.typo3-dyntabmenu td.tab:hover a, table#typo3-tabmenu td.tabact, table#typo3-tabmenu td.tab:hover, table#typo3-tabmenu td.tabact:hover { @@ -29,15 +28,14 @@ table#typo3-tabmenu td.tabact:hover { color: #000; } -table.typo3-dyntabmenu td.tab_over a, +table.typo3-dyntabmenu td.tab:hover a, table#typo3-tabmenu td.tab:hover { background-color: #eeeeee; border-color: #adadad; color: #606060; } -table.typo3-dyntabmenu td.disabled, -table.typo3-dyntabmenu td.disabled_over { +table.typo3-dyntabmenu td.disabled { background: #e8e8e8; border: 1px solid #d6d6d6; color: #b7b7b7; @@ -48,8 +46,7 @@ table.typo3-dyntabmenu td a { border-bottom: 1px solid #ffffff; } -table.typo3-dyntabmenu td.tab a, -table.typo3-dyntabmenu td.tab_over a { +table.typo3-dyntabmenu td.tab a { border-bottom: 1px solid #c0c0c0; } @@ -81,11 +78,8 @@ div.typo3-dyntabmenu-divs p.c-descr { /* Foldout tabs */ div.typo3-dyntabmenu-divs-foldout div.tab, -div.typo3-dyntabmenu-divs-foldout div.tab_over, div.typo3-dyntabmenu-divs-foldout div.tabact, -div.typo3-dyntabmenu-divs-foldout div.tabact_over, -div.typo3-dyntabmenu-divs-foldout div.disabled, -div.typo3-dyntabmenu-divs-foldout div.disabled_over { +div.typo3-dyntabmenu-divs-foldout div.disabled { border: solid black 1px; border-radius: 3px; -webkit-border-radius: 3px; @@ -98,7 +92,7 @@ div.typo3-dyntabmenu-divs-foldout div.tab { background-repeat: no-repeat; } -div.typo3-dyntabmenu-divs-foldout div.tab_over { +div.typo3-dyntabmenu-divs-foldout div.tab:hover { background: #f6eab7; background-image: url('../../../../icons/gfx/ol/arrowbullet.gif'); background-repeat: no-repeat; @@ -110,7 +104,7 @@ div.typo3-dyntabmenu-divs-foldout div.tabact { background-repeat: no-repeat; } -div.typo3-dyntabmenu-divs-foldout div.tabact_over { +div.typo3-dyntabmenu-divs-foldout div.tabact:hover { background: #f6eab7; background-image: url('../../../../icons/gfx/ol/arrowbullet.gif'); background-repeat: no-repeat; @@ -121,15 +115,13 @@ div.typo3-dyntabmenu-divs-foldout div.disabled { color: #999; } -div.typo3-dyntabmenu-divs-foldout div.disabled_over { +div.typo3-dyntabmenu-divs-foldout div.disabled:hover { background: #f6eab7; color: #999; } div.typo3-dyntabmenu-divs-foldout div.tab a, -div.typo3-dyntabmenu-divs-foldout div.tabact a, -div.typo3-dyntabmenu-divs-foldout div.tab_over a, -div.typo3-dyntabmenu-divs-foldout div.tabact_over a { +div.typo3-dyntabmenu-divs-foldout div.tabact a { text-decoration: none; color: #000; } \ No newline at end of file