From 0b7e7de01d4527e6f04694424d1455d6e4d6a310 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Thu, 14 Feb 2013 17:10:20 +0000 Subject: [PATCH] get actions to show on et2; get refresh of the messagelist working; first step to implement row classes for recent/urgent --- mail/inc/class.mail_ui.inc.php | 6 +++--- mail/js/app.js | 5 ++++- mail/setup/etemplates.inc.php | 4 ++-- mail/templates/default/app.css | 20 ++++++++++++++++++++ mail/templates/default/index.xet | 2 +- 5 files changed, 30 insertions(+), 7 deletions(-) diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php index 31aae5b57b..8f92d96f35 100644 --- a/mail/inc/class.mail_ui.inc.php +++ b/mail/inc/class.mail_ui.inc.php @@ -754,7 +754,7 @@ class mail_ui unset($actions['mark']['children']['setLabel']); unset($actions['mark']['children']['unsetLabel']); } - return nextmatch_widget::egw_actions($actions, 'mail', '', $action_links); + return $actions; } /** @@ -983,7 +983,7 @@ error_log(__METHOD__.__LINE__.' SelectedFolder:'.$query['selectedFolder'].' Star //if (in_array("check", $cols)) // don't overwrite check with "false" as this forces the grid to // deselect the row - sending "0" doesn't do that - if (in_array("check", $cols)) $data["check"] = $previewMessage == $header['uid'] ? true : 0;// $row_selected; //TODO:checkbox true or false + //if (in_array("check", $cols)) $data["check"] = $previewMessage == $header['uid'] ? true : 0;// $row_selected; //TODO:checkbox true or false //$data["check"] =''; @@ -1208,7 +1208,7 @@ error_log(__METHOD__.__LINE__.' SelectedFolder:'.$query['selectedFolder'].' Star //$this->t->set_var('phpgw_images',EGW_IMAGES); //$result["data"] = $data; - //$result["rowClass"] = implode(' ', $css_styles); + $data["class"] = implode(' ', $css_styles); $rv[] = $data; //error_log(__METHOD__.__LINE__.array2string($result)); } diff --git a/mail/js/app.js b/mail/js/app.js index 2a7ba87d85..763ecbf053 100644 --- a/mail/js/app.js +++ b/mail/js/app.js @@ -27,7 +27,7 @@ function mail_startTimerFolderStatusUpdate(_refreshTimeOut) { if(mail_doTimedRefresh) { window.clearTimeout(mail_doTimedRefresh); } - if(_refreshTimeOut > 6000) { + if(_refreshTimeOut > 59000) {//we do not set _refreshTimeOut's less than a minute mail_doTimedRefresh = window.setInterval("mail_refreshFolderStatus()", _refreshTimeOut); } } @@ -43,6 +43,9 @@ function mail_refreshFolderStatus(_nodeID,mode) { var activeFolders = getTreeNodeOpenItems(nodeToRefresh,mode2use); queueRefreshFolderList(activeFolders); */ + var nm = etemplate2.getByApplication('mail')[0].widgetContainer.getWidgetById('nm'); + nm.applyFilters(); // this should refresh the active folder + } /** diff --git a/mail/setup/etemplates.inc.php b/mail/setup/etemplates.inc.php index 2e1315acab..e99fb77ec5 100644 --- a/mail/setup/etemplates.inc.php +++ b/mail/setup/etemplates.inc.php @@ -2,7 +2,7 @@ /** * EGroupware - eTemplates for Application mail * http://www.egroupware.org - * generated by soetemplate::dump4setup() 2013-02-13 16:05 + * generated by soetemplate::dump4setup() 2013-02-14 17:30 * * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @package mail @@ -14,7 +14,7 @@ $templ_version=1; $templ_data[] = array('name' => 'mail.index','template' => '','lang' => '','group' => '0','version' => '1.9.001','data' => 'a:3:{i:0;a:3:{s:7:"onclick";s:47:"mail_changeFolder(widget.event_args[0],widget);";s:4:"name";s:14:"nm[foldertree]";s:4:"type";s:4:"tree";}i:1;a:2:{s:4:"type";s:4:"html";s:4:"name";s:3:"msg";}i:2;a:3:{s:4:"name";s:2:"nm";s:4:"size";s:15:"mail.index.rows";s:4:"type";s:9:"nextmatch";}}','size' => '','style' => '','modified' => '1360682502',); -$templ_data[] = array('name' => 'mail.index.rows','template' => '','lang' => '','group' => '0','version' => '1.9.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:6:{s:2:"c1";s:2:"th";s:1:"A";s:2:"25";s:1:"F";s:2:"50";s:1:"E";s:3:"120";s:1:"D";s:3:"120";s:1:"C";s:2:"95";}i:1;a:6:{s:1:"A";a:4:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:2:"ID";s:4:"name";s:3:"uid";s:8:"readonly";s:1:"1";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"subject";s:5:"label";s:7:"subject";}s:1:"C";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"date";s:4:"name";s:4:"date";s:5:"align";s:6:"center";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:2:"to";s:4:"name";s:9:"toaddress";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"from";s:4:"name";s:11:"fromaddress";}s:1:"F";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"size";s:4:"name";s:4:"size";s:5:"align";s:6:"center";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"name";s:11:"${row}[uid]";s:8:"readonly";s:1:"1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:4:"name";s:15:"${row}[subject]";}s:1:"C";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:12:"${row}[date]";s:8:"readonly";s:1:"1";s:5:"align";s:6:"center";}s:1:"D";a:3:{s:4:"type";s:9:"url-email";s:4:"name";s:17:"${row}[toaddress]";s:8:"readonly";s:1:"1";}s:1:"E";a:3:{s:4:"type";s:9:"url-email";s:4:"name";s:19:"${row}[fromaddress]";s:8:"readonly";s:1:"1";}s:1:"F";a:5:{s:4:"type";s:8:"vfs-size";s:4:"name";s:12:"${row}[size]";s:7:"no_lang";s:1:"1";s:8:"readonly";s:1:"1";s:5:"align";s:5:"right";}}}s:4:"rows";i:2;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1360252030',); +$templ_data[] = array('name' => 'mail.index.rows','template' => '','lang' => '','group' => '0','version' => '1.9.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:7:{s:2:"c1";s:2:"th";s:1:"A";s:2:"25";s:1:"F";s:2:"50";s:1:"E";s:3:"120";s:1:"D";s:3:"120";s:1:"C";s:2:"95";s:2:"c2";s:16:"$row_cont[class]";}i:1;a:6:{s:1:"A";a:4:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:2:"ID";s:4:"name";s:3:"uid";s:8:"readonly";s:1:"1";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"subject";s:5:"label";s:7:"subject";}s:1:"C";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"date";s:4:"name";s:4:"date";s:5:"align";s:6:"center";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:2:"to";s:4:"name";s:9:"toaddress";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"from";s:4:"name";s:11:"fromaddress";}s:1:"F";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"size";s:4:"name";s:4:"size";s:5:"align";s:6:"center";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"name";s:11:"${row}[uid]";s:8:"readonly";s:1:"1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:4:"name";s:15:"${row}[subject]";}s:1:"C";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:12:"${row}[date]";s:8:"readonly";s:1:"1";s:5:"align";s:6:"center";}s:1:"D";a:3:{s:4:"type";s:9:"url-email";s:4:"name";s:17:"${row}[toaddress]";s:8:"readonly";s:1:"1";}s:1:"E";a:3:{s:4:"type";s:9:"url-email";s:4:"name";s:19:"${row}[fromaddress]";s:8:"readonly";s:1:"1";}s:1:"F";a:5:{s:4:"type";s:8:"vfs-size";s:4:"name";s:12:"${row}[size]";s:7:"no_lang";s:1:"1";s:8:"readonly";s:1:"1";s:5:"align";s:5:"right";}}}s:4:"rows";i:2;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1360252030',); $templ_data[] = array('name' => 'mail.TestConnection','template' => '','lang' => '','group' => '0','version' => '1.9.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:1;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1360585356',); diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css index 0a6270c5b5..4e81f88dc6 100644 --- a/mail/templates/default/app.css +++ b/mail/templates/default/app.css @@ -18,45 +18,65 @@ tr.mail a { } tr.recent div, +tr.recent span, +tr.recent time, tr.recent a, tr.unseen div, +tr.unseen span, +tr.unseen time, tr.unseen a { color: #003075; font-weight: bold; } tr.label1 div, +tr.label1 span, +tr.label1 time, tr.label1 a { color: #ff0080 !important; } tr.label2 div, +tr.label2 span, +tr.label2 time, tr.label2 a { color: #ff8000 !important; } tr.label3 div, +tr.label3 span, +tr.label3 time, tr.label3 a { color: #008000 !important; } tr.label4 div, +tr.label4 span, +tr.label4 time, tr.label4 a { color: #0000ff !important; } tr.label5 div, +tr.label5 span, +tr.label5 time, tr.label5 a { color: #8000ff !important; } tr.flagged div, +tr.flagged span, +tr.flagged time, tr.flagged a { color: #ff0000 !important; } tr.prio_high div, +tr.prio_high span, +tr.prio_high time, tr.prio_high a { color: #ac0000 !important; } tr.deleted div, +tr.deleted span, +tr.deleted time, tr.deleted a { color: silver; text-decoration : line-through; diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet index 0d858485ed..ef5a4e04fb 100644 --- a/mail/templates/default/index.xet +++ b/mail/templates/default/index.xet @@ -20,7 +20,7 @@ - +