From 2a7b7d9376c0b915d46a11b299e101b97d5ad8b6 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Wed, 4 Dec 2013 09:52:59 +0000
Subject: [PATCH] display all Adresses popup

---
 mail/js/app.js                                | 21 +++++++++++++--
 mail/templates/default/app.css                |  5 ++++
 mail/templates/default/displayAllAdresses.xet | 27 ++++++++++---------
 3 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/mail/js/app.js b/mail/js/app.js
index 7ca2a999c5..3516d3afca 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -547,17 +547,34 @@ app.classes.mail = AppJS.extend(
 	mail_showAllAddresses: function(_id) {
 		var dataElem = {data:{subject:"",fromaddress:"",toaddress:"",additionaltoaddress:"",ccaddress:"",date:"",subject:""}};
 		dataElem = egw.dataGetUIDdata(_id);
-		console.log(_id,dataElem);
+		//console.log(_id,dataElem);
 		var buttons = [
 			{text: this.egw.lang("Close"), id:"close"}
 		];
+		var allAddresses = [{type:this.egw.lang('from'),address:dataElem.data.fromaddress}];
+		allAddresses.push({type:this.egw.lang('to'),address:dataElem.data.toaddress})
+		var parsedTo = [];
+		if (dataElem.data.additionaltoaddress.length>0) parsedTo=JSON.parse(dataElem.data.additionaltoaddress);
+//console.log(_id,parsedTo);
+		for (i=0;i<parsedTo.length;i++)
+		{
+			allAddresses.push({type:'',address:parsedTo[i]});
+		}
+		var parsedCC = [];
+		if (dataElem.data.ccaddress.length>0) parsedCC=JSON.parse(dataElem.data.ccaddress);
+//console.log(_id,parsedCC);
+		for (i=0;i<parsedCC.length;i++)
+		{
+			allAddresses.push({type:(i==0?this.egw.lang('cc'):''),address:parsedCC[i]});
+		}
 		var dialog = et2_createWidget("dialog",{
 			// If you use a template, the second parameter will be the value of the template, as if it were submitted.
 			callback: function(button_id, value) {},
 			buttons: buttons,
+			modal: false,
 			title: dataElem.data.subject,
 			template:"/egroupware/mail/templates/default/displayAllAdresses.xet",
-			value: { content: {displayallAdresses:[{type:this.egw.lang('to'),address:JSON.parse(dataElem.data.additionaltoaddress)[0]}]}, sel_options: {}}
+			value: { content: {displayallAdresses:allAddresses}, sel_options: {}}
 		});
 
 	},
diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index c1cdf83eb6..cda161952b 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -373,6 +373,11 @@ input[type=button] {
 	position: relative;
 	background-color: white;
 }
+.maildisplayAllAdresses {
+	max-height: 245px !important;
+	overflow:scroll;
+	overflow-x:hidden;
+}
 #mail-compose_fileselector {
 	width: 245px !important;
 }
diff --git a/mail/templates/default/displayAllAdresses.xet b/mail/templates/default/displayAllAdresses.xet
index 2140f24930..969df28002 100644
--- a/mail/templates/default/displayAllAdresses.xet
+++ b/mail/templates/default/displayAllAdresses.xet
@@ -2,17 +2,20 @@
 <!-- $Id$ -->
 <overlay>
 	<template id="mail.displayAllAdresses" template="" lang="" group="0" version="1.9.001">
-		<grid disabled="@no_griddata" id="displayallAdresses">
-		  <columns>
-		   <column width="10%" />
-		   <column width="80%" />
-		  </columns>
-		  <rows>
-		   <row >
-			<description id="${row}[type]" />
-			<url-email align="right" id="${row}[address]" readonly='true'/>
-		   </row>
-		  </rows>
-		</grid>
+		<description value="All Adresses:" />
+		<vbox class="maildisplayAllAdresses">
+			<grid disabled="@no_griddata" id="displayallAdresses">
+			  <columns>
+			   <column width="10%" />
+			   <column width="80%" />
+			  </columns>
+			  <rows>
+			   <row >
+				<description id="${row}[type]" />
+				<url-email align="left" id="${row}[address]" readonly='true'/>
+			   </row>
+			  </rows>
+			</grid>
+		</vbox>
 	</template>
 </overlay>