From 1716d5ef5a2d276582d4121d2f03b1149991e316 Mon Sep 17 00:00:00 2001 From: alecpl Date: Fri, 8 Oct 2010 07:14:03 +0000 Subject: [PATCH] - Add message list menu to css-sprite image --- program/steps/mail/func.inc | 16 +++++++++++----- skins/default/images/messageicons.gif | Bin 1501 -> 1574 bytes skins/default/images/messageicons.png | Bin 2816 -> 2997 bytes skins/default/mail.css | 11 +++++++++-- skins/default/templates/mail.html | 2 +- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 914ab1538..ab2109fc5 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -358,11 +358,17 @@ function rcmail_message_list_head($attrib, $a_show_cols) // define sortable columns $a_sort_cols = array('subject', 'date', 'from', 'to', 'size', 'cc'); - if (!empty($attrib['optionsmenuicon'])) - $list_menu = html::a( - array('href' => '#', 'onclick' => 'return '.JS_OBJECT_NAME.".command('menu-open', 'messagelistmenu')"), - html::img(array('src' => $skin_path . $attrib['optionsmenuicon'], 'id' => 'listmenulink', 'title' => rcube_label('listoptions'))) - ); + if (!empty($attrib['optionsmenuicon'])) { + $onclick = 'return ' . JS_OBJECT_NAME . ".command('menu-open', 'messagelistmenu')"; + if ($attrib['optionsmenuicon'] === true || $attrib['optionsmenuicon'] == 'true') + $list_menu = html::div(array('onclick' => $onclick, 'class' => 'listmenu', + 'id' => 'listmenulink', 'title' => rcube_label('listoptions'))); + else + $list_menu = html::a(array('href' => '#', 'onclick' => $onclick), + html::img(array('src' => $skin_path . $attrib['optionsmenuicon'], + 'id' => 'listmenulink', 'title' => rcube_label('listoptions'))) + ); + } else $list_menu = ''; diff --git a/skins/default/images/messageicons.gif b/skins/default/images/messageicons.gif index 07e90cca033e887c6aeda6c79b281faec1164931..c792dae3c1c7ed0655dc79849ae20e16de1a98c0 100644 GIT binary patch delta 857 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 diff --git a/skins/default/mail.css b/skins/default/mail.css index 3342f8957..2a524e8a5 100644 --- a/skins/default/mail.css +++ b/skins/default/mail.css @@ -696,8 +696,6 @@ body.messagelist display: inline-block; } -#messagelist tr td div.collapsed, -#messagelist tr td div.expanded, #messagelist tbody tr td.flag { cursor: pointer; @@ -711,6 +709,7 @@ body.messagelist #messagelist tr td div.collapsed, #messagelist tr td div.expanded, +#messagelist tr td.threads div.listmenu, #messagelist tr td.attachment span.attachment, #messagelist tr td.flag span.flagged, #messagelist tr td.flag span.unflagged:hover, @@ -778,11 +777,19 @@ body.messagelist #messagelist tr td div.collapsed { background-position: -195px 0; + cursor: pointer; } #messagelist tr td div.expanded { background-position: -180px 0; + cursor: pointer; +} + +#messagelist tr td.threads div.listmenu +{ + background-position: -210px 1px; + cursor: pointer; } #messagelist tbody tr td.subject diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html index 840907e5f..1e444f839 100644 --- a/skins/default/templates/mail.html +++ b/skins/default/templates/mail.html @@ -58,7 +58,7 @@ cellspacing="0" columns="" summary="Message list" - optionsmenuIcon="/images/icons/columnpicker.gif" /> + optionsmenuIcon="true" />