R55842 - in /trunk/mail: inc/class.mail_ui.inc.php lang/egw_de.lang lang/egw_en.lang

[leithoff]

Author: leithoff
New Revision: 55842

URL: http://svn.stylite.de/viewvc/egroupware?rev=55842&view=rev
Log:
reenable filter2 (short-preview in list trigger)

Modified:
trunk/mail/inc/class.mail_ui.inc.php
trunk/mail/lang/egw_de.lang
trunk/mail/lang/egw_en.lang

Modified: trunk/mail/inc/class.mail_ui.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/mail/inc/class.mail_ui.inc.php?rev=55842&r1=55841&r2=55842&view=diff

— trunk/mail/inc/class.mail_ui.inc.php (original)
+++ trunk/mail/inc/class.mail_ui.inc.php Tue Apr 26 12:13:59 2016
@@ -442,7 +442,7 @@

			// These must always be set, even if $content is an array
			$content[self::$nm_index]['cat_is_select'] = true;    // Category select is just a normal selectbox

•   		$content[self::$nm_index]['no_filter2'] = true;       // Disable second filter
  

•   		$content[self::$nm_index]['no_filter2'] = false;       // Disable second filter
    		$content[self::$nm_index]['actions'] = self::get_actions();
    		$content[self::$nm_index]['row_id'] = 'row_id';	     // is a concatenation of trim($GLOBALS['egw_info']['user']['account_id']):profileID:base64_encode(FOLDERNAME):uid
    		$content[self::$nm_index]['placeholder_actions'] = array('composeasnew');
  

@@ -533,7 +533,7 @@
//error_log(METHOD.LINE.array2string($GLOBALS[‘egw_info’][‘user’][‘preferences’][‘mail’][‘ActiveSearchType’]));
$content[self::$nm_index][‘cat_id’] = $GLOBALS[‘egw_info’][‘user’][‘preferences’][‘mail’][‘ActiveSearchType’];
$sel_options[‘filter’] = $this->statusTypes;

•   		$sel_options['filter2'] = array(''=>'No details',1=>'Details');
  

•   		$sel_options['filter2'] = array(''=>lang('No details'),1=>lang('Details'));
    		$content[self::$nm_index]['filter2'] = $GLOBALS['egw_info']['user']['preferences']['mail']['ShowDetails'];
  
    		$etpl = new etemplate_new('mail.index');
  

@@ -4203,7 +4203,7 @@
$response = egw_json_response::get();
$response->call(‘app.mail.mail_refreshCatIdOptions’,$this->searchTypes);
$response->call(‘app.mail.mail_refreshFilterOptions’,$this->statusTypes);

•   $response->call('app.mail.mail_refreshFilter2Options',array(''=>'No details',1=>'Details'));
  

•   $response->call('app.mail.mail_refreshFilter2Options',array(''=>lang('No details'),1=>lang('Details')));
  

  }

Modified: trunk/mail/lang/egw_de.lang
URL: http://svn.stylite.de/viewvc/egroupware/trunk/mail/lang/egw_de.lang?rev=55842&r1=55841&r2=55842&view=diff

— trunk/mail/lang/egw_de.lang (original)
+++ trunk/mail/lang/egw_de.lang Tue Apr 26 12:13:59 2016
@@ -92,6 +92,7 @@
deactive mail de Deaktiviert
default sorting order mail de Wählen Sie die Standard-Sortierreihenfolge aus.
default your name and email common de z.B. Ihr Name und Ihre Mail-Adresse
+details mail de Kurzvorschau in der Liste
delete folder mail de Ordner Löschen
delete folder %1 ? mail de Ordner %1 löschen?
deleted mail de gelöscht
@@ -303,6 +304,7 @@
no action defined! mail de Keine Aktion ausgewählt!
no address to/cc/bcc supplied, and no folder to save message to provided. mail de Keine Empfänger-Adresse (An/Kopie/Blindkopie) angegeben und kein Ordner zur Ablage der E-Mail spezifiziert.
no adress, to send this mail to, supplied mail de Keine Empfängeradresse angegeben!
+no details mail de Keine Kurzvorschau in der Liste
no folder destination supplied, and no folder to save message or other measure to store the mail (save to infolog/tracker) provided, but required. mail de Es sind keine Zielordner oder andere Methoden (als Infolog/Tracker ablegen) angegeben, um die Nachricht nach dem Senden zu speichern.
no folders mail de Keine Ordner
no message body supplied mail de Keinen Nachrichtentext - Teil gefunden.

Modified: trunk/mail/lang/egw_en.lang
URL: http://svn.stylite.de/viewvc/egroupware/trunk/mail/lang/egw_en.lang?rev=55842&r1=55841&r2=55842&view=diff

— trunk/mail/lang/egw_en.lang (original)
+++ trunk/mail/lang/egw_en.lang Tue Apr 26 12:13:59 2016
@@ -92,6 +92,7 @@
deactive mail en Deactive
default sorting order mail en Default sorting order
default your name and email common en default your name and email
+details mail en short preview in list
delete folder mail en Delete Folder
delete folder %1 ? mail en DELETE Folder %1 ?
deleted mail en deleted
@@ -303,6 +304,7 @@
no action defined! mail en No action defined!
no address to/cc/bcc supplied, and no folder to save message to provided. mail en No Address TO/CC/BCC supplied, and no folder to save message to provided.
no adress, to send this mail to, supplied mail en no adress, to send this mail to, supplied
+no details mail en no short preview in list
no folder destination supplied, and no folder to save message or other measure to store the mail (save to infolog/tracker) provided, but required. mail en No Folder destination supplied, and no folder to save message or other measure to store the mail (save to infolog/tracker) provided, but required.
no folders mail en no folders
no message body supplied mail en no message body supplied

---

Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z

---

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs