Author: leithoff
New Revision: 55063
URL: http://svn.stylite.de/viewvc/egroupware?rev=55063&view=rev
Log:
first sketch preview, triggered by details/no details
Modified:
trunk/mail/inc/class.mail_ui.inc.php
trunk/mail/templates/default/index.xet
trunk/mail/templates/pixelegg/app.css
trunk/mail/templates/pixelegg/app.less
— trunk/mail/inc/class.mail_ui.inc.php (original)
+++ trunk/mail/inc/class.mail_ui.inc.php Thu Feb 18 16:46:02 2016
@@ -422,8 +422,8 @@
$content[self::$nm_index] = array(
‘filter’ => ‘any’, // filter is used to choose the mailbox
’no_filter2’ => false, // I disable the 2. filter (params are the same as for filter)
-
'no_cat' => true, // I disable the cat-selectbox
-
//'cat_is_select' => 'no_lang', // true or no_lang
-
'no_cat' => false, // I disable the cat-selectbox
-
'cat_is_select' => true, // true or no_lang
'lettersearch' => false, // I show a lettersearch
'searchletter' => false, // I0 active letter of the lettersearch or false for [all]
'start' => 0, // IO position in list
@@ -520,8 +520,9 @@
if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
}
if (!emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]) unset($this->searchTypes[‘quick’]);
-
$sel_options['cat_id'] = $this->searchTypes;
$sel_options['filter'] = $this->statusTypes;
-
$sel_options['filter2'] = array(''=>'No details',1=>'Details');
$etpl = new etemplate_new('mail.index');
// Start at 2 so auto-added copy+paste actions show up as second group
@@ -718,7 +719,7 @@
// sending preview toolbar actions
if ($content[‘mailSplitter’]) $etpl->setElementAttribute(‘mailPreview[toolbar]’, ‘actions’, $this->get_toolbar_actions());
-
if (empty($content[self::$nm_index]['cat_id']) || empty($content[self::$nm_index]['search'])) $content[self::$nm_index]['cat_id']=(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject');
$readonlys = $preserv = array();
if (mail_bo::$debugTimes) mail_bo::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
}
@@ -1306,7 +1307,7 @@
}
$filter = array(
‘filterName’ => (emailadmin_imapbase::$supportsORinQuery[$mail_ui->mail_bo->profileID]?lang(‘quicksearch’):lang(‘subject’)),
@@ -1353,8 +1354,8 @@
$reverse,
$filter,
$sRToFetch,
-
true//, //cacheResult
-
//true // fetchPreview
@@ -1370,8 +1371,8 @@
$reverse,
$filter,
null, // this uids only
-
true//, // cacheResult
-
//true // fetchPreview
@@ -4374,7 +4375,7 @@
emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE,‘email’,‘supportsORinQuery’.trim($GLOBALS[‘egw_info’][‘user’][‘account_id’]), null, array(), 606010);
if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
}
-
$filter = $filter2toggle = array('filterName' => (emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?lang('quicksearch'):lang('subject')),'type' => ($query['filter2']?$query['filter2']:(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject')),'string' => $query['search'],'status' => 'any');
-
$filter = $filter2toggle = array('filterName' => (emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?lang('quicksearch'):lang('subject')),'type' => ($query['cat_id']?$query['cat_id']:(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject')),'string' => $query['search'],'status' => 'any');
}
else
{
@@ -4540,7 +4541,7 @@
if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
}
$filtered = true;
-
$filter = array('filterName' => (emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?lang('quicksearch'):lang('subject')),'type' => ($query['filter2']?$query['filter2']:(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject')),'string' => $query['search'],'status' => (!empty($query['filter'])?$query['filter']:'any'));
-
$filter = array('filterName' => (emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?lang('quicksearch'):lang('subject')),'type' => ($query['cat_id']?$query['cat_id']:(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject')),'string' => $query['search'],'status' => (!empty($query['filter'])?$query['filter']:'any'));
}
else
{
@@ -4666,7 +4667,7 @@
if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
}
$filtered = true;
-
$filter = array('filterName' => (emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?lang('quicksearch'):lang('subject')),'type' => ($query['filter2']?$query['filter2']:(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject')),'string' => $query['search'],'status' => (!empty($query['filter'])?$query['filter']:'any'));
-
$filter = array('filterName' => (emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?lang('quicksearch'):lang('subject')),'type' => ($query['cat_id']?$query['cat_id']:(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject')),'string' => $query['search'],'status' => (!empty($query['filter'])?$query['filter']:'any'));
}
else
{
— trunk/mail/templates/default/index.xet (original)
+++ trunk/mail/templates/default/index.xet Thu Feb 18 16:46:02 2016
@@ -103,7 +103,10 @@
-
<vbox>
-
<description id="${row}[subject]" no_lang="1"/>
-
<description id="${row}[bodypreview]" no_lang="1" class='et2_label bodypreview'/>
-
</vbox>
<date-time_today align="center" id="${row}[date]" readonly="true"/>
<date-time_today align="center" id="${row}[modified]" readonly="true"/>
<url-email id="${row}[address]" contact_plus = "true" readonly="true"/>
— trunk/mail/templates/pixelegg/app.css (original)
+++ trunk/mail/templates/pixelegg/app.css Thu Feb 18 16:46:02 2016
@@ -922,7 +922,7 @@
background-repeat: repeat-x;
}
#mail-index div#mail-index_nm tr.mail div span {
- max-height: 50px;
-webkit-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
-moz-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
@@ -1879,6 +1879,15 @@
font-size: 12px;
font-family: Arial;
}
+.bodypreview {
- white-space: normal !important;
- max-height: 25px !important;
- font-size: 11px;
- font-style: italic;
- font-weight : normal !important;
- font-family: Arial;
- color: grey !important;
+}
TR.sieveRowActive {
font-size: 11px;
height: 20px;
— trunk/mail/templates/pixelegg/app.less (original)
+++ trunk/mail/templates/pixelegg/app.less Thu Feb 18 16:46:02 2016
@@ -125,7 +125,7 @@
// Bilder in den Listen
tr.mail td img {
@@ -1104,6 +1104,14 @@
font-family : Arial;
}
+.bodypreview {
- font-size: 10px;
- font-style: italic;
- font-weight : normal;
- font-family: Arial;
- color: grey;
+}
-
TR.sieveRowActive
{
font-size: 11px;
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs
