summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-08-22 15:44:07 +0000
committeralecpl <alec@alec.pl>2011-08-22 15:44:07 +0000
commit7a2bade211d2e8951dda2b88754a564670847b35 (patch)
treec458ec4503b8ef2039800c9b91c4e534334094a4
parentf0bccb7fb23847b24c8bd598cfb75fc385550211 (diff)
- Added 'priority' column on messages list
-rw-r--r--CHANGELOG1
-rw-r--r--config/main.inc.php.dist2
-rw-r--r--program/include/rcube_imap.php1
-rw-r--r--program/include/rcube_imap_generic.php2
-rw-r--r--program/js/app.js6
-rw-r--r--program/steps/mail/func.inc5
-rw-r--r--skins/default/ie6hacks.css6
-rw-r--r--skins/default/images/messageicons.gifbin1687 -> 1998 bytes
-rw-r--r--skins/default/images/messageicons.pngbin2354 -> 4062 bytes
-rw-r--r--skins/default/mail.css42
-rw-r--r--skins/default/templates/mail.html1
11 files changed, 60 insertions, 6 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 0df9b97fb..131b3e871 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Added 'priority' column on messages list
- Fix image type check for contact photo uploads
RELEASE 0.6-beta
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 85afa8c7f..159331af1 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -360,7 +360,7 @@ $rcmail_config['message_sort_col'] = '';
$rcmail_config['message_sort_order'] = 'DESC';
// These cols are shown in the message list. Available cols are:
-// subject, from, to, cc, replyto, date, size, status, flag, attachment
+// subject, from, to, cc, replyto, date, size, status, flag, attachment, 'priority'
$rcmail_config['list_cols'] = array('subject', 'status', 'from', 'date', 'size', 'flag', 'attachment');
// the default locale setting (leave empty for auto-detection)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 6a35af0a8..4a37af6e0 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -96,7 +96,6 @@ class rcube_imap
'MESSAGE-ID',
'CONTENT-TRANSFER-ENCODING',
'REFERENCES',
- 'X-PRIORITY',
'X-DRAFT-INFO',
'MAIL-FOLLOWUP-TO',
'MAIL-REPLY-TO',
diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php
index e3c987cd3..dd10033bc 100644
--- a/program/include/rcube_imap_generic.php
+++ b/program/include/rcube_imap_generic.php
@@ -1537,7 +1537,7 @@ class rcube_imap_generic
if ($bodystr)
$request .= "BODYSTRUCTURE ";
$request .= "BODY.PEEK[HEADER.FIELDS (DATE FROM TO SUBJECT CONTENT-TYPE ";
- $request .= "CC REPLY-TO LIST-POST DISPOSITION-NOTIFICATION-TO".$add.")])";
+ $request .= "CC REPLY-TO LIST-POST DISPOSITION-NOTIFICATION-TO X-PRIORITY".$add.")])";
if (!$this->putLine($request)) {
$this->setError(self::ERROR_COMMAND, "Unable to send command: $request");
diff --git a/program/js/app.js b/program/js/app.js
index bbb14e7ad..9da19b2bb 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1778,6 +1778,12 @@ function rcube_webmail()
html = expando;
else if (c == 'subject')
html = tree + cols[c];
+ else if (c == 'priority') {
+ if (flags.prio > 0 && flags.prio < 6)
+ html = '<span class="prio'+flags.prio+'">&nbsp;</span>';
+ else
+ html = '&nbsp;';
+ }
else
html = cols[c];
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index b04628fa4..50de7108d 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -253,7 +253,7 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null
return;
// remove 'threads', 'attachment', 'flag', 'status' columns, we don't need them here
- foreach (array('threads', 'attachment', 'flag', 'status') as $col) {
+ foreach (array('threads', 'attachment', 'flag', 'status', 'priority') as $col) {
if (($key = array_search($col, $a_show_cols)) !== FALSE)
unset($a_show_cols[$key]);
}
@@ -309,6 +309,8 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null
$a_msg_flags['flagged'] = 1;
if ($header->others['list-post'])
$a_msg_flags['ml'] = 1;
+ if ($header->priority)
+ $a_msg_flags['prio'] = (int) $header->priority;
$a_msg_flags['ctype'] = Q($header->ctype);
$a_msg_flags['mbox'] = $mbox;
@@ -372,6 +374,7 @@ function rcmail_message_list_head($attrib, $a_show_cols)
$col_name = '<span class="flagged">&nbsp;</span>';
break;
case 'attachment':
+ case 'priority':
case 'status':
$col_name = '<span class="' . $col .'">&nbsp;</span>';
break;
diff --git a/skins/default/ie6hacks.css b/skins/default/ie6hacks.css
index bfdb6f087..5da6e7aa9 100644
--- a/skins/default/ie6hacks.css
+++ b/skins/default/ie6hacks.css
@@ -131,6 +131,12 @@ ul.toolbarmenu li.separator_below
#messagelist tr td.threads div.listmenu,
#messagelist tr td.attachment span.attachment,
#messagelist tr td.attachment span.report,
+#messagelist tr td.priority span.priority,
+#messagelist tr td.priority span.prio1,
+#messagelist tr td.priority span.prio2,
+#messagelist tr td.priority span.prio3,
+#messagelist tr td.priority span.prio4,
+#messagelist tr td.priority span.prio5,
#messagelist tr td.flag span.flagged,
#messagelist tr td.flag span.unflagged:hover,
#messagelist tr td.status span.status,
diff --git a/skins/default/images/messageicons.gif b/skins/default/images/messageicons.gif
index 60526f1f3..80423dd1e 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 3dd37606e..d45f065ea 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 4e6e15405..22e69397c 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -702,7 +702,8 @@ body.messagelist
#messagelist tr td.flag span,
#messagelist tr td.status span,
-#messagelist tr td.attachment span
+#messagelist tr td.attachment span,
+#messagelist tr td.priority span
{
width: 15px;
}
@@ -712,6 +713,12 @@ body.messagelist
#messagelist tr td.threads div.listmenu,
#messagelist tr td.attachment span.attachment,
#messagelist tr td.attachment span.report,
+#messagelist tr td.priority span.priority,
+#messagelist tr td.priority span.prio1,
+#messagelist tr td.priority span.prio2,
+#messagelist tr td.priority span.prio3,
+#messagelist tr td.priority span.prio4,
+#messagelist tr td.priority span.prio5,
#messagelist tr td.flag span.flagged,
#messagelist tr td.flag span.unflagged:hover,
#messagelist tr td.status span.status,
@@ -742,6 +749,36 @@ body.messagelist
background-position: 0 -255px;
}
+#messagelist tr td.priority span.priority
+{
+ background-position: 0 -309px;
+}
+
+#messagelist tr td.priority span.prio5
+{
+ background-position: 0 -358px;
+}
+
+#messagelist tr td.priority span.prio4
+{
+ background-position: 0 -340px;
+}
+
+#messagelist tr td.priority span.prio3
+{
+ background-position: 0 -324px;
+}
+
+#messagelist tr td.priority span.prio2
+{
+ background-position: 0 -309px;
+}
+
+#messagelist tr td.priority span.prio1
+{
+ background-position: 0 -290px;
+}
+
#messagelist tr td.flag span.flagged
{
background-position: 0 -153px;
@@ -837,7 +874,8 @@ body.messagelist
#messagelist tr td.attachment,
#messagelist tr td.threads,
#messagelist tr td.status,
-#messagelist tr td.flag
+#messagelist tr td.flag,
+#messagelist tr td.priority
{
width: 17px;
padding: 0 0 0 2px;
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index ea6a2f71c..30b56aa41 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -166,6 +166,7 @@
<li><input type="checkbox" name="list_col[]" value="status" id="cols_status" /><label for="cols_status"><roundcube:label name="readstatus" /></label></li>
<li><input type="checkbox" name="list_col[]" value="attachment" id="cols_attachment" /><label for="cols_attachment"><roundcube:label name="attachment" /></label></li>
<li><input type="checkbox" name="list_col[]" value="flag" id="cols_flag" /><label for="cols_flag"><roundcube:label name="flag" /></label></li>
+ <li><input type="checkbox" name="list_col[]" value="priority" id="cols_priority" /><label for="cols_priority"><roundcube:label name="priority" /></label></li>
</ul>
</fieldset>
<roundcube:endif />