diff options
| -rw-r--r-- | program/include/main.inc | 11 | ||||
| -rw-r--r-- | skins/default/mail.css | 16 |
2 files changed, 15 insertions, 12 deletions
diff --git a/program/include/main.inc b/program/include/main.inc index 869921edb..629599dc5 100644 --- a/program/include/main.inc +++ b/program/include/main.inc @@ -1053,10 +1053,6 @@ function rcmail_render_folder_tree_html(&$arrFolders, &$mbox_name, $maxlength, $ 'id' => "rcmli".$folder_id, 'class' => join(' ', $classes), 'noclose' => true), - html::div(array( - 'class' => empty($folder['folders']) ? 'nocollapse' : ($collapsed ? 'collapsed' : 'expanded'), - 'onclick' => sprintf("%s.command('collapse-folder', '%s')", JS_OBJECT_NAME, $js_name) - ), ' ') . html::a(array( 'href' => rcmail_url('', array('_mbox' => $folder['id'])), 'onclick' => sprintf("return %s.command('list','%s',this)", JS_OBJECT_NAME, $js_name), @@ -1064,7 +1060,12 @@ function rcmail_render_folder_tree_html(&$arrFolders, &$mbox_name, $maxlength, $ 'onmouseout' => sprintf("return %s.unfocus_folder('%s')", JS_OBJECT_NAME, $js_name), 'onmouseup' => sprintf("return %s.folder_mouse_up('%s')", JS_OBJECT_NAME, $js_name), 'title' => $title, - ), Q($foldername))); + ), Q($foldername)) . + (!empty($folder['folders']) ? html::div(array( + 'class' => ($collapsed ? 'collapsed' : 'expanded'), + 'style' => "position:absolute", + 'onclick' => sprintf("%s.command('collapse-folder', '%s')", JS_OBJECT_NAME, $js_name) + ), ' ') : '')); if (!empty($folder['folders'])) $out .= "\n<ul" . ($collapsed ? " style=\"display: none;\"" : "") . ">\n" . rcmail_render_folder_tree_html($folder['folders'], $mbox_name, $maxlength, $realnames, $nestLevel+1) . "</ul>\n"; diff --git a/skins/default/mail.css b/skins/default/mail.css index 159f59cdc..9bf1b0ee7 100644 --- a/skins/default/mail.css +++ b/skins/default/mail.css @@ -266,6 +266,7 @@ td.formlinks a:visited #mailboxlist { + position:relative; width: 100%; height: auto; margin: 0px; @@ -278,6 +279,8 @@ td.formlinks a:visited #mailboxlist li { + display: block; + position: relative; font-size: 11px; background: url(images/icons/folder-closed.png) no-repeat; background-position: 5px 1px; @@ -287,11 +290,11 @@ td.formlinks a:visited #mailboxlist li div { position: absolute; - padding-left: 10px; - padding-top: 2px; - padding-bottom: 2px; - margin-right: 2px; - width: 12px; + left: 8px !important; + left: -16px; + top: 2px; + width: 14px; + height: 16px; } #mailboxlist li div.collapsed, @@ -339,12 +342,11 @@ td.formlinks a:visited { cursor: default; display: block; + position: relative; padding-left: 25px; padding-top: 2px; padding-bottom: 2px; text-decoration: none; - /* css hack for IE */ - margin-top: expression('-12px'); } #mailboxlist li.unread |