From 1716d5ef5a2d276582d4121d2f03b1149991e316 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 08 Oct 2010 03:14:03 -0400
Subject: [PATCH] - Add message list menu to css-sprite image
---
skins/default/templates/mail.html | 2 +-
skins/default/images/messageicons.png | 0
skins/default/images/messageicons.gif | 0
skins/default/mail.css | 11 +++++++++--
program/steps/mail/func.inc | 16 +++++++++++-----
5 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 914ab15..ab2109f 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -358,11 +358,17 @@
// 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 07e90cc..c792dae 100644
--- a/skins/default/images/messageicons.gif
+++ b/skins/default/images/messageicons.gif
Binary files differ
diff --git a/skins/default/images/messageicons.png b/skins/default/images/messageicons.png
index 7d21ab9..61bc51e 100644
--- a/skins/default/images/messageicons.png
+++ b/skins/default/images/messageicons.png
Binary files differ
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 3342f89..2a524e8 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -696,8 +696,6 @@
display: inline-block;
}
-#messagelist tr td div.collapsed,
-#messagelist tr td div.expanded,
#messagelist tbody tr td.flag
{
cursor: pointer;
@@ -711,6 +709,7 @@
#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 @@
#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 840907e..1e444f8 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" />
</div>
<div class="boxfooter">
<div id="listcontrols" class="pagenav">
--
Gitblit v1.9.1