commit 974fcc8e75abddf6a1058f000db82e5155dd0631 Author: Kiphaas7 Date: Thu Sep 27 21:17:08 2012 +0800 additional fixes diff --git a/core/modules/system/system.admin.css b/core/modules/system/system.admin.css index 374db82..f51383f 100644 --- a/core/modules/system/system.admin.css +++ b/core/modules/system/system.admin.css @@ -58,14 +58,20 @@ small .admin-link:after { /** * Modules page. */ +#system-modules table { + table-layout: fixed; +} #system-modules div.incompatible { font-weight: bold; } +#system-modules th.checkbox { + width: 15%; +} #system-modules th.module-name { - width: 30%; + width: 25%; } #system-modules th.module-description { - width: 70%; + width: 60%; } #system-modules td { vertical-align: top; @@ -87,40 +93,33 @@ small .admin-link:after { color: #5c5c5b; height: 20px; line-height: 20px; - position: relative; -} -#system-modules .description .inner .details { overflow: hidden; /* truncates descriptions if too long */ - position: absolute; - white-space: nowrap; - width: 100%; text-overflow: ellipsis; + white-space: nowrap; } #system-modules .expanded .description .inner { - position: static; height: auto; -} -#system-modules .expanded .description .inner .details { - overflow: auto; - position: static; + overflow: visible; white-space: normal; - width: auto; } -#system-modules .expanded .description .inner .details .text { +#system-modules .expanded .description .text { -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; } @media screen and (max-width: 40em) { - #system-modules .description .inner .details .text { + #system-modules .description .text { display: none; } + #system-modules th.checkbox { + width: 20%; + } #system-modules th.module-name { - width: 70%; + width: 40%; } #system-modules th.module-description { - width: 30%; + width: 40%; } } #system-modules .description .version { diff --git a/core/modules/system/system.base.css b/core/modules/system/system.base.css index 6d0ca78..610d94d 100644 --- a/core/modules/system/system.base.css +++ b/core/modules/system/system.base.css @@ -144,7 +144,6 @@ div.tree-child-horizontal { table.sticky-header { background-color: #fff; margin-top: 0; - z-index: 200; } /** diff --git a/core/modules/system/system.modules.js b/core/modules/system/system.modules.js index 7c8c424..f8e43a5 100644 --- a/core/modules/system/system.modules.js +++ b/core/modules/system/system.modules.js @@ -4,8 +4,8 @@ $.extend(Drupal.settings, { hideModules: { - method: 'slideToggle', - duration: 'fast' + method: 'toggle', + duration: 0 } }); @@ -21,12 +21,22 @@ Drupal.behaviors.hideModuleInformation = { // Fancy animating. $tbodies.on('click keydown', 'tr', function (e) { if (e.type === 'click' || (e.type === 'keydown' && e.keyCode === 13)) { - e.preventDefault(); - var $tr = $(this); - $tr.find('.requirements, .links')[effect.method](effect.duration) - .promise().done(function() { - $tr.toggleClass('expanded'); - }); + if (e.target.nodeName !== 'A') { + e.preventDefault(); + var $tr = $(this); + var $toggleElements = $tr.find('.requirements, .links'); + + // Prevent empty elements from being shown. + if ($.trim($toggleElements.text()) === '') { + $tr.toggleClass('expanded'); + } + else { + $toggleElements[effect.method](effect.duration) + .promise().done(function() { + $tr.toggleClass('expanded'); + }); + } + } } }); // Makes the whole cell a click target.