Index: /branches/2.0/phpgwapi/templates/classic/listUsers.php
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/listUsers.php	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/listUsers.php	(revision 1196)
@@ -0,0 +1,175 @@
+<?php			
+	$current = $_GET['currentApp'];
+	$GLOBALS['phpgw_info']['flags'] = array(
+		'noheader' => True,
+		'nonavbar' => True,
+		'currentapp' => $current
+	);
+	
+	include('../../../header.inc.php');
+	//include('../../../admin/templates/celepar/head.inc.php');
+		
+	$owner	 =  $_SESSION['owner'];
+	$acl_app =  $_SESSION['acl_app'];
+	
+	if(!$acl_app)
+		$acl_app = $current;
+
+	if(!@is_object($GLOBALS['phpgw']->js))	{
+		
+		$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
+	}
+		
+	$GLOBALS['phpgw']->common->phpgw_header();	
+	
+	
+	$t = &$GLOBALS['phpgw']->template;						
+	// seta o Template
+	$t->set_file(array('addUser_t' => '../../../phpgwapi/templates/celepar/listUsers.tpl'));
+
+	$obj_account = CreateObject('phpgwapi.accounts',$owner);
+
+	$post_select_organization = $_POST['select_organization'];
+	$post_select_sector = $_POST['select_sector'];
+	$change_organization = $_POST['change_organization'];
+	
+	$obj_org_sector = CreateObject('phpgwapi.sector_search_ldap');
+	if ((!$post_select_organization) && (!$post_select_sector)) //primeira vez
+	{
+		$user_org = $obj_account->get_organization($GLOBALS['phpgw_info']['user']['account_dn']);
+		$user_sector = $obj_account->get_sector($GLOBALS['phpgw_info']['user']['account_dn']);
+		$user_context = $obj_account->get_context($GLOBALS['phpgw_info']['user']['account_dn']);
+		
+		$organizations_info = $obj_org_sector->organization_search($GLOBALS['phpgw_info']['server']['ldap_context']);
+		@asort($organizations_info);
+		@reset($organizations_info);					
+		$sectors_info = $obj_org_sector->sector_search('ou='.$user_org.','.$GLOBALS['phpgw_info']['server']['ldap_context']);
+	}
+	else //mudou uma das combos
+	{
+		$user_org = $post_select_organization;
+		$user_sector = $post_select_sector;
+		if ($change_organization == "True")
+			$user_context = 'ou='.$user_org.','.$GLOBALS['phpgw_info']['server']['ldap_context'];
+		else
+			$user_context = $post_select_sector;
+		$organizations_info = $obj_org_sector->organization_search($GLOBALS['phpgw_info']['server']['ldap_context']);
+		@asort($organizations_info);
+		@reset($organizations_info);					
+		$sectors_info = $obj_org_sector->sector_search('ou='.$user_org.','.$GLOBALS['phpgw_info']['server']['ldap_context']);
+	}
+		
+	foreach($organizations_info as $organization)
+	{
+		$combo_organization .= '<option value="' . $organization . '"'; 	
+		
+		if (!$post_select_organization)
+		{
+			if($organization == $user_org)
+			{
+				$combo_organization .= ' selected';
+			}
+		}
+		else
+		{
+			if($organization == $post_select_organization)
+			{
+				$combo_organization .= ' selected';
+			}
+		}	
+		$combo_organization .= '>' .$organization.'</option>'."\n";
+	}
+	
+	$combo_sector .= '<option value="ou='.$user_org.','.$GLOBALS['phpgw_info']['server']['ldap_context'].'"> --------- </option>'."\n";
+	foreach($sectors_info as $sector)
+	{
+		$combo_sector .= '<option value="' . $sector->sector_context . '"';
+
+		if (!$post_select_sector)
+		{
+			if($sector->sector_name == $user_sector)
+				$combo_sector .= ' selected';
+		}
+		else
+		{
+			if($sector->sector_context == $post_select_sector)
+				$combo_sector .= ' selected';
+		}
+		$combo_sector .= '>' .$sector->sector_name.'</option>'."\n";
+	}			
+	
+	// Monta lista de Grupos e Usuários
+	$users = Array();
+	$groups = Array();
+	
+	$typeAccount = 'u';
+	
+	if($_GET['type']) 
+		$typeAccount = $_GET['type']; 
+
+	$ldap_host =$GLOBALS['phpgw_info']['server']['ldap_host'];
+	$ds = $GLOBALS['phpgw']->common->ldapConnect();
+    if ($ds) 
+    {
+		$sr=ldap_list($ds, $user_context, ("(&(cn=*)(phpgwaccounttype=".$typeAccount."))"));
+		$info = ldap_get_entries($ds, $sr);
+		
+		if($typeAccount == 'u'){ 
+			for ($i=0; $i<$info["count"]; $i++)
+			{
+				if ($info[$i]["phpgwaccountvisible"][0] == '-1')
+					continue;
+				$users[$uids=$info[$i]["uidnumber"][0]] = Array('name'	=>	$uids=$info[$i]["cn"][0], 'type'	=>	u );
+			}
+		}
+		else {
+			for ($i=0; $i<$info["count"]; $i++)	
+				$users[$uids=$info[$i]["gidnumber"][0]] = Array('name'	=>	$uids=$info[$i]["cn"][0], 'type'	=>	g);		
+		
+		}
+	}
+	ldap_close($ds);
+    	
+	@asort($users);
+	@reset($users);	
+//	@asort($groups);
+//	@reset($groups);
+
+	
+	$options ='';
+
+	
+	if($current == 'preferences'){
+		foreach($users as $id => $user_array) {
+			if($owner != $id){
+				$newId = 'u_'.$acl_app.'['.$id;			
+				$options .= '<option  value="'.$newId.'">'.utf8_decode($user_array['name']).'</option>'."\n";
+			}
+		}
+	}
+	else if($current == 'admin') {
+		foreach($users as $id => $user_array) {		
+			$options .= '<option  value="'.$id.'">'.utf8_decode($user_array['name']).'</option>'."\n";
+		}		
+	}
+
+	$t->set_var ('lang_Organization',lang('Organization'));
+	$t->set_var ('lang_Sector',lang('Sector'));
+	$t->set_var ('lang_Calendar',lang('Calendar'));
+	$t->set_var ('lang_Add_Participants',lang('Add Participants'));
+	$t->set_var ('lang_to_Search',lang('to Search'));
+	$t->set_var ('lang_Close',lang('Close'));
+	$t->set_var ('lang_Add',lang('Add'));
+	
+	if($current == 'preferences')
+		$t->set_var ('addUser','javascript:addUserAcl()');
+	else
+		$t->set_var ('addUser','javascript:addUser()');
+		
+	$t->set_var('options',$options);
+	$t->set_var('combo_organization', $combo_organization);
+	$t->set_var('combo_sector', $combo_sector);
+	$t->parse('out','addUser_t',true);
+	$t->p('out');
+	$GLOBALS['phpgw']->common->phpgw_exit();	
+?>
Index: /branches/2.0/phpgwapi/templates/classic/css.tpl
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/css.tpl	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/css.tpl	(revision 1196)
@@ -0,0 +1,9 @@
+<style type="text/css">
+<!--
+	.row_on { color: {row_text}; background-color: {row_on}; }
+	.row_off { color: {row_text}; background-color: {row_off}; }
+	.th { color: {th_text}; background-color: {th_bg}; }
+	{app_css}
+-->
+</style>
+{css_file}
Index: /branches/2.0/phpgwapi/templates/classic/about_unknown.tpl
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/about_unknown.tpl	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/about_unknown.tpl	(revision 1196)
@@ -0,0 +1,12 @@
+ <tr>
+  <td align="center"><font size="5"><b>{app_header}<b></font></td>
+ </tr>
+ <tr>
+  <td>&nbsp;</td>
+ </tr>
+ <tr>
+  <td>&nbsp;</td>
+ </tr>
+ <tr>
+  <td align="center"><b>Sorry, no further information is available on this application.</b></td>
+ </tr>
Index: /branches/2.0/phpgwapi/templates/classic/notes/notes98.reg
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/notes/notes98.reg	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/notes/notes98.reg	(revision 1196)
@@ -0,0 +1,24 @@
+REGEDIT4
+
+[HKEY_CLASSES_ROOT\notes]
+@="URL:Notes Protocol"
+"URL Protocol"=""
+
+[HKEY_CLASSES_ROOT\notes\DefaultIcon]
+@="\"C:\\Notes\\notes.exe\" =U:\\Win\\notes.ini"
+
+[HKEY_CLASSES_ROOT\notes\shell]
+
+[HKEY_CLASSES_ROOT\notes\shell\open]
+
+[HKEY_CLASSES_ROOT\notes\shell\open\command]
+@="\"C:\\Notes\\notes.exe\" =U:\\Win\\notes.ini %1"
+
+[HKEY_CLASSES_ROOT\.ndl]
+
+[HKEY_CLASSES_ROOT\.ndl\Shell]
+
+[HKEY_CLASSES_ROOT\.ndl\Shell\Open]
+
+[HKEY_CLASSES_ROOT\.ndl\Shell\Open\Command]
+@="C:\\notes\\notes.exe =U:\\Win\\notes.ini %1"
Index: /branches/2.0/phpgwapi/templates/classic/notes/notes.html
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/notes/notes.html	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/notes/notes.html	(revision 1196)
@@ -0,0 +1,52 @@
+<html>
+<head>
+  <meta content="text/html; charset=ISO-8859-1"  http-equiv="content-type">
+  <title>Notes</title>
+  <script>
+  	function doneInstall (name , result){
+		if (result == 0)
+			alert("O pacote " + name + " foi instalado com sucesso!\n" +
+			"Reinicie o seu navegador para completar a instalacao.");
+		else
+			alert("A instalacao do pacote " + name + " retornou o erro: " + result);
+	}
+	function doInstall() {
+		var xpi = new Object();
+		xpi["notes"] = "notes.xpi";
+		InstallTrigger.install(xpi,doneInstall);
+	}
+  </script>
+  <style>
+  	.cabec { font-family: verdana, arial; font-size: 12pt; font-weight: bold; color: black }
+  	.texto { font-family: verdana, arial; font-size: 11pt; font-weight: normal; color: black; padding-right: 10%; }
+  	.texto2 { font-family: verdana, arial; font-size: 11pt; font-weight: normal; color: black; padding-left: 5%; padding-right: 10%; }
+  	.titulo { font-family: verdana, arial; font-size: 11pt; font-weight: bold; color: black; padding-right: 10%; }
+  	.item { font-family: verdana, arial; font-size: 11pt; font-weight: normal; color: black; padding-left: 5%; padding-right: 10%; }
+  	.item2 { font-family: verdana, arial; font-size: 11pt; font-weight: bold; color: black; padding-left: 5%; padding-right: 10%; }
+  </style>  		
+</head>
+<body>
+	<p class="cabec">COMO CONFIGURAR SEU NAVEGADOR PARA ABRIR O LOTUS NOTES</p>
+    <p class="texto">Esta instala&ccedil;&atilde;o configura o seu navegador para abrir o programa Lotus Notes quando um link para documento, vis&atilde;o ou base Notes for clicado em uma p&aacute;gina.</p>
+	<p class="titulo">Ambiente Linux / Mozilla 1.7+ / Firefox 0.9+:</p>
+	<span class="texto2">&Eacute; necess&aacute;rio que o Notes j&aacute; esteja instalado em seu computador. Se voc&ecirc; usa Latinux, j&aacute; existe um &iacute;cone para o Notes na sua &aacute;rea de trabalho. Clique no &iacute;cone para testar o Notes. Para outros sistemas Linux, providencie a instala&ccedil;&atilde;o do emulador Wine e do Lotus Notes, antes de prosseguir.</span><br><br> 
+	<span class="item">1) Instale o pacote <a href="http://expresso.pr.gov.br/phpgwapi/templates/celepar/notes/notes.xpi" onclick="doInstall(); return false;">notes.xpi</a></span><br>
+	<span class="item">2) Reinicie o seu navegador</span><br>
+	<span class="item">3) Complete a instala&ccedil;&atilde;o seguindo os passos abaixo:</span>
+	<p class="item2">FireFox:</p>
+	<span class="item">- Clique no menu Ferramentas/Extens&otilde;es</span><br>
+	<span class="item">- Clique em notes</span><br>
+	<span class="item">- Clique no bot&atilde;o op&ccedil;&otilde;es</span><br>
+	<span class="item">- Clique no bot&atilde;o Testar Emulador</span><br>
+	<span class="item">- Clique no bot&atilde;o Procurar Comando</span><br>
+	<span class="item">- Clique no bot&atilde;o OK para salvar a configura&ccedil;&atilde;o</span>	
+	<p class="item2">Mozilla:</p>
+	<span class="item">- Clique no menu Editar/Prefer&ecirc;ncias</span><br>
+	<span class="item">- Clique em notes</span><br>
+	<span class="item">- Clique no bot&atilde;o Testar Emulador</span><br>
+	<span class="item">- Clique no bot&atilde;o Procurar Comando</span><br>
+	<span class="item">- Clique no bot&atilde;o OK para salvar a configura&ccedil;&atilde;o</span></p>
+	<p class="titulo">Ambiente Windows 95/98/XP:</p> 
+     <p class="texto2">Funciona no ambiente Windows, com os navegadores IE, Mozilla e Firefox, sem necessidade de configura&ccedil;&otilde;es.</p>
+</body>
+</html>
Index: /branches/2.0/phpgwapi/templates/classic/css/celepar.css
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/css/celepar.css	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/css/celepar.css	(revision 1196)
@@ -0,0 +1,411 @@
+ul
+{
+	list-style-image: url("../images/orange-ball.png");
+}
+
+.grid_email_class
+{
+	border-bottom:1px solid #cfcfcf;
+}
+
+body 
+{
+	margin: 0px !important;
+	background-color:#E9E9E9 !important;
+	font-size: 11px !important;
+	font-family: Verdana, Arial, Helvetica, sans-serif !important;
+	padding:0px !important;
+}
+
+img
+{
+	border-width:0px !important;
+	border-style:none !important;
+	/*filter:progid:DXImageTransform.Microsoft.AlphaImageLoader;
+*/
+}
+
+a:link,a:visited
+{
+	cursor:pointer !important;
+	color: #000066 !important;
+	text-decoration: none !important;
+}
+
+/*
+a:visited 
+{
+	color: #006699; 
+	text-decoration: none;
+}
+*/
+a:hover,a:active
+{
+	cursor:pointer !important;
+	color: #ff9933 !important;
+	text-decoration: underline !important;
+}
+/*
+a:active 
+{
+	color: #006699; 
+	text-decoration: underline;
+}
+*/
+input,button
+{
+	font-size: 11px !important; 
+	color: #006699 !important; 
+	font-family: Arial, Helvetica, sans-serif !important;
+	border: 1px #bbbbbb solid !important;
+}
+
+input[type=submit],input[type=button],button
+{
+	margin:1px !important;
+	padding:1px !important;
+	cursor: pointer !important; 
+	cursor: hand !important;
+}
+
+input[type=image]
+{
+	cursor: pointer !important; 
+	cursor: hand !important;
+	border: 0px #bbbbbb none !important;
+}
+select 
+{
+	font-size: 11px !important; 
+	color: #000066 !important; 
+	font-family: Arial, Helvetica, sans-serif !important;
+	border: 1px #bbbbbb solid !important;
+	z-index: -1 !important;
+}
+
+td
+{
+	font-size: 11px !important;
+	/*text-align:left;*/
+	/*	padding-top:1px;
+	padding-bottom:1px;*/
+}
+
+.divLoginbox 
+{
+	position:relative;
+	width: 300px; 
+	border-right: #9c9c9c 1px solid; 
+	border-top: #9c9c9c 1px solid; 
+	border-left: #9c9c9c 1px solid; 
+	border-bottom: #9c9c9c 1px solid
+}
+
+.divLoginboxHeader 
+{
+	text-align:center;
+	background-color:#dddddd;
+	padding-top:2px;
+	font-size:10px;
+	color:#666666;
+}
+.divSidebox 
+{
+	position:relative;
+	width: 147px; 
+	border-right: #9c9c9c 1px solid; 
+	border-top: #9c9c9c 1px solid; 
+	border-left: #9c9c9c 1px solid; 
+	border-bottom: #9c9c9c 1px solid
+}
+
+.tblHeadApp {
+
+	border-right: #9c9c9c 1px solid; 	
+	border-top: #9c9c9c 1px solid; 
+	border-left: #9c9c9c 1px solid; 
+	border-bottom: #9c9c9c 1px solid
+}
+
+.divSideboxHeader 
+{
+	text-align:center;
+	background-color:#000066;
+	padding-top:2px;
+	height: 15px;
+	color: #FFFFFF;
+
+}
+
+a.divSideboxEntry, .divSideboxEntry
+{
+	text-align:left;
+	height:16px;
+	background-color:#eeeeee;
+}
+
+a.appTitles,.appTitles
+{
+	font-size: 10px; 
+	height:18px;
+	padding-top:2px;
+	padding-bottom:2px;
+
+}
+
+a.textSidebox
+{
+	font-size: 10px; 
+	border-top: #aaaaaa 0px none;
+}
+
+.textSidebox
+{
+	font-size: 10px; 
+	height:18px;
+	padding-top:2px;
+	padding-bottom:2px;
+	border-top: #aaaaaa 1px solid;
+
+}
+
+.sideboxSpace
+{
+	height:9px;
+}
+
+.greyLine
+{
+	margin:1px;
+	border-top-color:#7e7e7e;
+	border-top-width:1px;
+	border-top-style:solid;
+	height:1px;
+}
+
+.prefSection
+{
+	font-weight:bold;
+	font-size:16px;
+	line-height:40px;
+}
+
+#extraIcons
+{
+/*	position:absolute;
+	z-index:13;
+	right:10px;
+	top:113px;
+	visibility:hidden;*/
+/*	background-image:url(../images/alpha-white.png);*/
+	background-color:#eeeeee;
+	border-width:1px;
+	border-color:#7e7e7e;
+	border-style:solid;
+}
+
+.extraIconsRow
+{
+	border-top-color:#dddddd;
+	border-top-width:1px;
+	border-top-style:solid;
+	padding:2px;
+}
+
+#divMain
+{
+	background-color:white;
+	margin-top: 0px;
+	padding:9px;
+	border-color:#7e7e7e;
+	border-width:1px;
+	border-style:solid;
+}
+
+#divLogo
+{
+	position:absolute;
+	left:20px;
+	top:5px;
+	z-index:51;
+}
+
+#divAppIconBar
+{
+	background-color:white;
+	border-top-color:#9c9c9c;
+	border-top-width:1px;
+	border-top-style:solid;
+	background-image: url(../images/background-icon-bar.png); 
+	background-repeat: repeat-x
+}
+
+#divAppTextBar
+{
+	background-color:white;
+}
+
+#divStatusBar
+{
+	background-color:#f7f8fa;
+	height:15px;
+	padding-left:10px;
+	padding-top:0px;
+}
+
+/*#divSubContainer
+{
+}
+*/
+#tdSidebox
+{
+	width:170px;
+	background-color:white;
+	overflow:visible;
+}
+
+
+#tdAppbox
+{
+	background-color:white;
+	width: 100%;
+}
+#divSideboxContainer
+{
+	position:relative;
+	width:150px;
+	top:0px;
+	left:0px;
+	background-color:white;
+	border-width:1px;
+	border-style:solid;
+	z-index:40;
+}
+
+#divAppboxHeader
+{
+	margin-top:2px;
+	margin-left:2px;
+	margin-right:2px;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	font-weight: bold;
+	color: #000066;
+	text-align: center;
+	padding: 0px;	
+	background-image:url(../images/appbox-header-background21.png);
+	background-repeat: repeat-x;
+	height:24px;
+	line-height:24px;
+	border-top-color:#9c9c9c;
+	border-top-width:1px;
+	border-top-style:solid;
+	border-left-color:#9c9c9c;
+	border-left-width:1px;
+	border-left-style:solid;
+	border-right-color:#9c9c9c;
+	border-right-width:1px;
+	border-right-style:solid;
+}
+
+#divAppbox
+{
+	background-color:#f7f7f7;
+	padding-right:1px;
+	padding-top:1px;
+	padding-bottom:1px;
+	padding-left:15px;
+	border-bottom-color:#9c9c9c;
+	border-bottom-width:1px;
+	border-bottom-style:solid;
+	border-left-color:#9c9c9c;
+	border-left-width:1px;
+	border-left-style:solid;
+	border-right-color:#9c9c9c;
+	border-right-width:1px;
+	border-right-style:solid;
+	margin-top:0px;
+	margin-bottom:0px;
+	margin-left:2px;
+	margin-right:2px;
+
+}
+
+#fmStatusBar
+{
+	margin-left:4px;
+	margin-bottom:3px;
+	font-size: 10px; 
+/*	font-family: Verdana, Arial, Helvetica, sans-serif;*/
+	
+
+}
+
+
+.fmButton
+{
+	background-image:url(../images/buttonbackground.png);
+	width:28px;
+	height:28px;
+	background-repeat: no-repeat;
+}
+
+#fmLocation
+{
+	position:relative;
+	/*background-image:url(../images/buttonbackgroundscaled.png);
+	background-repeat: repeat-x;*/
+	/*margin-left:4px;*/
+	margin-bottom:3px;
+	height:27px;
+
+}
+
+#fmMenu
+{
+	position:relative;
+}
+#fmFileWindow
+{
+	background-color:#ffffff;
+	margin-left:4px;
+	padding:5px;
+	position:relative;
+	border-right: #cccccc 1px solid; 
+	border-top: #9c9c9c 2px solid; 
+	border-left: #9c9c9c 2px solid; 
+	border-bottom: #cccccc 1px solid
+}
+
+#user_info
+{
+padding-left:17px;
+
+}
+
+#admin_info
+{
+	position:relative;
+	text-align:center;
+	margin-right:10px;
+}
+
+#divGenTime
+{
+	bottom:14px;
+	font-size: 9px;
+	color: #ff0000;
+	text-align:center;
+	width:99%;
+}
+
+#divPoweredBy 
+{
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 10px;
+	color: #999999;
+	text-decoration: none;
+	padding: 7px;
+	text-align: center;
+	background-color:white;
+}
Index: /branches/2.0/phpgwapi/templates/classic/css/kneschke.css
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/css/kneschke.css	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/css/kneschke.css	(revision 1196)
@@ -0,0 +1,390 @@
+/*
+StyleSheet coding standards:
+
+1. use lowercase if possible
+
+2. format styles like this:
+
+body
+{
+	font-size: 12px;
+	font-family: Verdana, Arial, Helvetica, sans-serif
+}
+
+3. existing html elements on top of the document, then all self defined .classes and at last all self defined #id's.
+
+4. close every property with ; also the last one.
+*/
+
+body 
+{
+	background-image:url(../images/body-background.png);
+	font-size: 11px; 
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	padding:14px;
+}
+
+img
+{
+	border-width:0px;
+	border-style:none;
+	/*filter:progid:DXImageTransform.Microsoft.AlphaImageLoader;
+*/
+}
+
+a:link,a:visited
+{
+	cursor:pointer;
+	color: #006699; 
+	text-decoration: none;
+}
+
+/*
+a:visited 
+{
+	color: #006699; 
+	text-decoration: none;
+}
+*/
+a:hover,a:active
+{
+	cursor:pointer;
+	color: #ff9933;
+	text-decoration: underline;
+}
+/*
+a:active 
+{
+	color: #006699; 
+	text-decoration: underline;
+}
+*/
+input,button
+{
+	font-size: 11px; 
+	color: #006699; 
+	font-family: Arial, Helvetica, sans-serif;
+	border: 1px #bbbbbb solid;
+}
+
+input[type=submit],input[type=button],button
+{
+	margin:1px;
+	padding:1px;
+	cursor: pointer; 
+	cursor: hand;
+}
+
+input[type=image]
+{
+	cursor: pointer; 
+	cursor: hand;
+	border: 0px #bbbbbb none;
+}
+select 
+{
+	font-size: 11px; 
+	color: #006699; 
+	font-family: Arial, Helvetica, sans-serif;
+	border: 1px #bbbbbb solid;
+}
+
+td
+{
+	font-size: 11px;
+	/*	padding-top:1px;
+	padding-bottom:1px;*/
+}
+
+.divLoginbox 
+{
+	position:relative;
+	width: 300px; 
+	border-right: #9c9c9c 1px solid; 
+	border-top: #9c9c9c 1px solid; 
+	border-left: #9c9c9c 1px solid; 
+	border-bottom: #9c9c9c 1px solid
+}
+
+.divLoginboxHeader 
+{
+	text-align:center;
+	background-color:#dddddd;
+	padding-top:2px;
+	font-size:10px;
+	color:#666666;
+}
+.divSidebox 
+{
+	position:relative;
+	width: 147px; 
+	border-right: #9c9c9c 1px solid; 
+	border-top: #9c9c9c 1px solid; 
+	border-left: #9c9c9c 1px solid; 
+	border-bottom: #9c9c9c 1px solid
+}
+
+.divSideboxHeader 
+{
+	text-align:center;
+	background-color:#dddddd;
+	padding-top:2px;
+	font-size:10px;
+	color:#666666;
+}
+
+a.divSideboxEntry, .divSideboxEntry
+{
+	text-align:left;
+	height:16px;
+	background-color:#eeeeee;
+}
+
+a.appTitles,.appTitles
+{
+	font-size: 10px; 
+	height:18px;
+	padding-top:2px;
+	padding-bottom:2px;
+}
+
+a.textSidebox
+{
+	font-size: 10px; 
+	border-top: #aaaaaa 0px none;
+}
+
+.textSidebox
+{
+	font-size: 10px; 
+	height:18px;
+	padding-top:2px;
+	padding-bottom:2px;
+	border-top: #aaaaaa 1px solid;
+
+}
+
+.sideboxSpace
+{
+	height:9px;
+}
+
+.greyLine
+{
+	margin:1px;
+	border-top-color:#7e7e7e;
+	border-top-width:1px;
+	border-top-style:solid;
+	height:1px;
+}
+
+.prefSection
+{
+	font-weight:bold;
+	font-size:16px;
+	line-height:40px;
+}
+
+#extraIcons
+{
+/*	position:absolute;
+	z-index:13;
+	right:10px;
+	top:113px;
+	visibility:hidden;*/
+	background-image:url(../images/alpha-white.png);
+	border-width:1px;
+	border-color:#7e7e7e;
+	border-style:solid;
+}
+
+
+
+#divMain
+{
+	background-color:white;
+	margin-top: 5px;
+	padding:9px;
+	border-color:#7e7e7e;
+	border-width:1px;
+	border-style:solid;
+}
+
+#divLogo
+{
+	position:absolute;
+	left:20px;
+	top:14px;
+	z-index:51;
+}
+
+#divAppIconBar
+{
+	background-color:white;
+	border-top-color:#9c9c9c;
+	border-top-width:1px;
+	border-top-style:solid;
+	background-image: url(../images/background-icon-bar.png); 
+	background-repeat: repeat-x
+}
+
+#divAppTextBar
+{
+	background-color:white;
+}
+
+#divStatusBar
+{
+	background-color:white;
+	height:15px;
+	padding-left:170px;
+	margin-top: 13px;
+	/*	margin-bottom: 2px;*/
+}
+
+/*#divSubContainer
+{
+}
+*/
+#tdSidebox
+{
+	width:170px;
+	background-color:white;
+	overflow:visible;
+}
+
+
+#tdAppbox
+{
+	background-color:white;
+	padding-left:5px;
+	width: 100%;
+}
+#divSideboxContainer
+{
+	position:relative;
+	width:150px;
+	top:0px;
+	left:0px;
+	background-color:white;
+	border-width:1px;
+	border-style:solid;
+	z-index:40;
+}
+
+#divAppboxHeader
+{
+	/*width:100%;*/
+	background-image:url(../images/appbox-header-background.png);
+	background-repeat: repeat-x;
+	height:36px;
+	line-height:28px;
+	text-align:center;
+	/*	padding-top:7px;*/
+	padding-bottom:0px;
+	font-size:14px;
+	font-weight:bold;
+	color:#666666;
+	border-top-color:#9c9c9c;
+	border-top-width:1px;
+	border-top-style:solid;
+	border-left-color:#9c9c9c;
+	border-left-width:1px;
+	border-left-style:solid;
+	border-right-color:#9c9c9c;
+	border-right-width:1px;
+	border-right-style:solid;
+}
+
+#divAppbox
+{
+/*	width:100%;*/
+	background-color:#f7f7f7;
+	padding:5px;
+	border-bottom-color:#9c9c9c;
+	border-bottom-width:1px;
+	border-bottom-style:solid;
+	border-left-color:#9c9c9c;
+	border-left-width:1px;
+	border-left-style:solid;
+	border-right-color:#9c9c9c;
+	border-right-width:1px;
+	border-right-style:solid;
+}
+
+#fmStatusBar
+{
+	margin-left:4px;
+	margin-bottom:3px;
+	font-size: 10px; 
+/*	font-family: Verdana, Arial, Helvetica, sans-serif;*/
+	
+
+}
+
+
+.fmButton
+{
+	background-image:url(../images/buttonbackground.png);
+	width:28px;
+	height:28px;
+	background-repeat: no-repeat;
+}
+
+#fmLocation
+{
+	position:relative;
+	/*background-image:url(../images/buttonbackgroundscaled.png);
+	background-repeat: repeat-x;*/
+	/*margin-left:4px;*/
+	margin-bottom:3px;
+	height:27px;
+
+}
+
+#fmMenu
+{
+	position:relative;
+}
+#fmFileWindow
+{
+	background-color:#ffffff;
+	margin-left:4px;
+	padding:5px;
+	position:relative;
+	border-right: #cccccc 1px solid; 
+	border-top: #9c9c9c 2px solid; 
+	border-left: #9c9c9c 2px solid; 
+	border-bottom: #cccccc 1px solid
+}
+
+#user_info
+{
+
+
+}
+
+#admin_info
+{
+	position:relative;
+	text-align:right;
+}
+
+#divGenTime
+{
+	bottom:14px;
+	font-size: 9px;
+	color: #ff0000;
+	text-align:center;
+	width:99%;
+}
+
+#divPoweredBy 
+{
+	bottom:14px;
+	font-size: 9px;
+	color: #000000;
+	text-align:center;
+	width:99%;
+}
+
Index: /branches/2.0/phpgwapi/templates/classic/css/jerryr.css
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/css/jerryr.css	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/css/jerryr.css	(revision 1196)
@@ -0,0 +1,655 @@
+/*
+StyleSheet coding standards:
+
+1. use lowercase if possible
+
+2. format styles like this:
+
+body
+{
+	font-size: 12px;
+	font-family: Verdana, Arial, Helvetica, sans-serif
+}
+
+3. existing html elements on top of the document, then all self defined .classes and at last all self defined #id's.
+
+4. close every property with ; also the last one.
+*/
+
+body 
+{
+	background-image:url(../images/body-background.png);
+	font-size: 11px; 
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	padding:0px;
+	margin-top: 5px;
+}
+
+img
+{
+	border-width:0px;
+	border-style:none;
+	/*filter:progid:DXImageTransform.Microsoft.AlphaImageLoader;
+*/
+}
+
+a:link,a:visited
+{
+	cursor:pointer;
+	color: #006699; 
+	text-decoration: none;
+}
+
+/*
+a:visited 
+{
+	color: #006699; 
+	text-decoration: none;
+}
+*/
+a:hover,a:active
+{
+	cursor:pointer;
+	color: #ff9933;
+}
+/*
+a:active 
+{
+	color: #006699; 
+	text-decoration: underline;
+}
+*/
+input,button
+{
+	font-size: 11px; 
+	color: #006699; 
+	font-family: Arial, Helvetica, sans-serif;
+	border: 1px #bbbbbb solid;
+}
+
+input[type=submit],input[type=button],button
+{
+	margin:1px;
+	padding:0px;
+	cursor: pointer; 
+	cursor: hand;
+}
+
+input[type=image]
+{
+	cursor: pointer; 
+	cursor: hand;
+	border: 0px #bbbbbb none;
+}
+select 
+{
+	font-size: 11px; 
+	color: #006699; 
+	font-family: Arial, Helvetica, sans-serif;
+	border: 1px #bbbbbb solid;
+}
+
+td
+{
+	font-size: 11px;
+	/*	padding-top:1px;
+	padding-bottom:0px;*/
+}
+
+.divLoginbox 
+{
+	position:relative;
+	width: 300px; 
+	border-right: #9c9c9c 1px solid; 
+	border-top: #9c9c9c 1px solid; 
+	border-left: #9c9c9c 1px solid; 
+	border-bottom: #9c9c9c 1px solid
+}
+
+.divLoginboxHeader 
+{
+	text-align:center;
+	background-color:#dddddd;
+	padding-top:2px;
+	font-size:10px;
+	color:#666666;
+}
+.divSidebox 
+{
+	position:relative;
+	width: 147px; 
+	border-right: #9c9c9c 1px solid; 
+	border-top: #9c9c9c 1px solid; 
+	border-left: #9c9c9c 1px solid; 
+	border-bottom: #9c9c9c 1px solid
+}
+
+.divSideboxHeader 
+{
+	text-align:center;
+	background-image:url(../images/divSideboxHeader-background.png);
+	height:18px;
+	background-color:#ffffff;
+	padding-top:1px;
+	border-bottom: #9c9c9c 1px solid
+	font-size:10px;
+	font-weight:bold;
+	color:#ffffff;
+}
+
+a.divSideboxEntry, .divSideboxEntry
+{
+	text-align:left;
+	height:16px;
+	background-color:#fafcff;
+}
+
+a.appTitles,.appTitles
+{
+	font-size: 10px; 
+	height:16px;
+	padding-top:0px;
+	padding-bottom:0px;
+}
+
+a.textSidebox
+{
+	
+	font-size: 10px; 
+	border-top: #aaaaaa 1px none;
+}
+
+.textSidebox
+{
+	
+	font-size: 10px; 
+	height:16px;
+	padding-top:1px;
+	padding-bottom:1px;
+	
+}
+
+.sideboxSpace
+{
+	height:9px;
+}
+
+.greyLine
+{
+	margin:1px;
+	border-top-color:#7e7e7e;
+	border-top-width:1px;
+	border-top-style:solid;
+	height:1px;
+}
+
+.prefSection
+{
+	font-weight:bold;
+	font-size:16px;
+	line-height:40px;
+}
+
+#extraIcons
+{
+/*	position:absolute;
+	z-index:13;
+	right:10px;
+	top:113px;
+	visibility:hidden;*/
+/*	background-image:url(../images/alpha-white.png); */
+	background-color:#eeeeee;
+	border-width:1px;
+	border-color:#7e7e7e;
+	border-style:solid;
+}
+
+
+
+#divMain
+{
+	background-color:white;
+	margin-top: 5px;
+	padding:5px;
+	border-color:#7e7e7e;
+	border-width:1px;
+	border-style:solid;
+}
+
+#divLogo
+{
+	position:absolute;
+	left:15px;
+	top:13px;
+	z-index:51;
+}
+
+#divAppIconBar
+{
+	background-color:white;
+	padding=0px;
+	border-top-color:#9c9c9c;
+	border-top-width:1px;
+	border-top-style:solid;
+	background-image: url(../images/background-icon-bar.png); 
+	background-repeat: repeat-x
+}
+
+#divAppTextBar
+{
+	background-color:white;
+}
+
+#divStatusBar
+{
+	background-color:white;
+	height:15px;
+	padding-left:10px;
+	margin-top: 1px;
+	/*	margin-bottom: 2px;*/
+}
+
+/*#divSubContainer
+{
+}
+*/
+#tdSidebox
+{
+	width:170px;
+	background-color:white;
+	overflow:visible;
+}
+
+
+#tdAppbox
+{
+	background-color:white;
+	padding-left:5px;
+	padding-right:0px;
+	padding-bottom:2px;
+	width: 100%;
+}
+#divSideboxContainer
+{
+	position:relative;
+	width:150px;
+	top:0px;
+	left:0px;
+	background-color:white;
+	border-width:1px;
+	border-style:solid;
+	z-index:40;
+}
+
+#divAppboxHeader
+{
+	/*width:100%;*/
+	background-image:url(../images/appbox-header-background.png);
+	background-repeat: repeat-x;
+	height:20px;
+	line-height:22px;
+	text-align:center;
+	/*	padding-top:7px;*/
+	padding-bottom:0px;
+	font-size:14px;
+	font-weight:bold;
+	color:#666666;
+	border-top-color:#9c9c9c;
+	border-top-width:1px;
+	border-top-style:solid;
+	border-left-color:#9c9c9c;
+	border-left-width:1px;
+	border-left-style:solid;
+	border-right-color:#9c9c9c;
+	border-right-width:1px;
+	border-right-style:solid;
+	border-bottom-color:#9c9c9c;
+	border-bottom-width:1px;
+	border-bottom-style:solid;
+}
+
+#divAppbox
+{
+/*	width:100%;*/
+	background-color:#faf8f3;
+	padding:5px;
+	
+}
+
+#fmStatusBar
+{
+	margin-left:4px;
+	margin-bottom:3px;
+	font-size: 10px; 
+/*	font-family: Verdana, Arial, Helvetica, sans-serif;*/
+	
+
+}
+
+
+.fmButton
+{
+	background-image:url(../images/buttonbackground.png);
+	width:28px;
+	height:28px;
+	background-repeat: no-repeat;
+}
+
+#fmLocation
+{
+	position:relative;
+	/*background-image:url(../images/buttonbackgroundscaled.png);
+	background-repeat: repeat-x;*/
+	/*margin-left:4px;*/
+	margin-bottom:3px;
+	height:27px;
+
+}
+
+#fmMenu
+{
+	position:relative;
+}
+#fmFileWindow
+{
+	background-color:#ffffff;
+	margin-left:4px;
+	padding:5px;
+	position:relative;
+	border-right: #9c9c9c 1px solid; 
+	border-top: #9c9c9c 2px solid; 
+	border-left: #9c9c9c 2px solid; 
+	border-bottom: #9c9c9c 1px solid
+}
+
+#user_info
+{
+
+
+}
+
+#admin_info
+{
+	position:relative;
+	text-align:right;
+}
+
+#divGenTime
+{
+	bottom:14px;
+	font-size: 9px;
+	color: #ff0000;
+	text-align:center;
+	width:99%;
+}
+
+#divPoweredBy 
+{
+	bottom:14px;
+	font-size: 9px;
+	color: #000000;
+	text-align:center;
+	width:99%;
+}
+
+.calRowBottomShadow
+{
+	background: url(../images/mid-foot.png); 
+	background-repeat: repeat-x;
+}
+
+
+.titleBarBackGround
+{
+	background-image: url(../images/appbox-header-background.png); 
+	height:22px;
+	background-repeat: repeat-x;
+	text-align:center;
+	border-top-color:#9c9c9c;
+	border-top-width:1px;
+	border-top-style:solid;
+	border-left-color:#9c9c9c;
+	border-left-width:1px;
+	border-left-style:solid;
+	border-right-color:#9c9c9c;
+	border-right-width:1px;
+	border-right-style:solid;
+	border-bottom-color:#9c9c9c;
+	border-bottom-width:1px;
+	border-bottom-style:solid;
+}
+
+.calDayTitleBeige
+{
+	background: url(../images/mid-title-beige.png); 
+	background-repeat: repeat-x;
+	height:28px;
+	text-align:center;
+	padding-bottom:0px;
+	font-size:14px;
+	font-weight:bold;
+	color:#666666;
+}
+
+.calDayTitleBlue
+{
+	background: url(../images/mid-title.png); 
+	background-repeat: repeat-x;
+	height:28px;
+	text-align:center;
+	padding-bottom:0px;
+	font-size:14px;
+	font-weight:bold;
+	color:#ffffff;
+}
+
+.calDayTitleRed
+{
+	background-image: url(../images/mid-title-red.png); 
+	background-repeat: repeat-x;
+	height:28px;
+	text-align:center;
+	padding-bottom:0px;
+	font-size:14px;
+	font-weight:bold;
+	color:#ffffff;
+}
+
+.calLeftShadow
+{
+	background: url(../images/lt-body.png); 
+	padding-bottom:0px;
+}
+
+.calRightShadow
+{
+	background: url(../images/rt-body.png); 
+	padding-bottom:0px;
+}
+
+.calLtLtTitleBlue
+{
+	background: url(../images/lt-lt-title.png); 
+	padding-bottom:0px;
+	height:28px;
+}
+
+.calLtMidTitleBlue
+{
+	background: url(../images/lt-mid-title.png); 
+	padding-bottom:0px;
+	height:28px;
+}
+
+.calRtMidTitleBlue
+{
+	background: url(../images/rt-mid-title.png); 
+	padding-bottom:0px;
+	height:28px;
+}
+
+.calRtMidTitleBeige
+{
+	background: url(../images/rt-mid-title-beige.png); 
+	padding-bottom:0px;
+	height:28px;
+}
+
+.calRtRtTitleBeige
+{
+	background: url(../images/rt-rt-title-beige.png); 
+	padding-bottom:0px;
+	height:28px;
+}
+
+.calRtRtTitleBlue
+{
+	background: url(../images/rt-rt-title.png); 
+	padding-bottom:0px;
+	height:28px;
+}
+
+.calLtLtTitleBeige
+{
+	background: url(../images/lt-lt-title-beige.png); 
+	padding-bottom:0px;
+	height:28px;
+}
+
+.calLtLtTitleRed
+{
+	background: url(../images/lt-lt-title-red.png); 
+	padding-bottom:0px;
+	height:28px;
+}
+
+.calLtMidTitleBeige
+{
+	background: url(../images/lt-mid-title-beige.png); 
+	padding-bottom:0px;
+	height:28px;
+}
+
+.calLtMidTitleRed
+{
+	background: url(../images/lt-mid-title-red.png); 
+	padding-bottom:0px;
+	height:28px;
+}
+
+.calRtMidTitleRed
+{
+	background: url(../images/rt-mid-title-red.png); 
+	padding-bottom:0px;
+	height:28px;
+}
+
+.calRtRtTitleRed
+{
+	background: url(../images/rt-rt-title-red.png); 
+	padding-bottom:0px;
+	height:28px;
+}
+
+.calLtLtFoot
+{
+	background: url(../images/lt-lt-foot.png); 
+	padding-bottom:0px;
+	height:17px;
+}
+
+.calLtMidFoot
+{
+	background: url(../images/lt-mid-foot.png); 
+	padding-bottom:0px;
+	height:17px;
+}
+
+.calRtMidFoot
+{
+	background: url(../images/rt-mid-foot.png); 
+	padding-bottom:0px;
+	height:17px;
+}
+
+.calRtRtFoot
+{
+	background: url(../images/rt-rt-foot.png); 
+	padding-bottom:0px;
+	height:17px;
+}
+
+.calDayView
+{
+	background-image: url(../images/appbox-header-background.png); 
+	height:22px;
+	background-repeat: repeat-x;
+	text-align:center;
+	padding-bottom:0px;
+	font-size:14px;
+	font-weight:bold;
+	color:#666666;
+	border-top-color:#9c9c9c;
+	border-top-width:1px;
+	border-top-style:solid;
+	border-left-color:#9c9c9c;
+	border-left-width:1px;
+	border-left-style:solid;
+	border-right-color:#9c9c9c;
+	border-right-width:1px;
+	border-right-style:solid;
+	border-bottom-color:#9c9c9c;
+	border-bottom-width:1px;
+	border-bottom-style:solid;
+}
+
+.calDayViewSideBoxes
+{
+	border-top-color:#9c9c9c;
+	border-top-width:1px;
+	border-top-style:solid;
+	border-left-color:#9c9c9c;
+	border-left-width:1px;
+	border-left-style:solid;
+	border-right-color:#9c9c9c;
+	border-right-width:1px;
+	border-right-style:solid;
+	border-bottom-color:#9c9c9c;
+	border-bottom-width:1px;
+	border-bottom-style:solid;
+	background-color:#faf8f3;
+}
+
+.calDayViewShadowBox
+{
+	border-top-color:#9c9c9c;
+	border-top-width:2px;
+	border-top-style:solid;
+	border-left-color:#9c9c9c;
+	border-left-width:2px;
+	border-left-style:solid;
+	border-right-color:#9c9c9c;
+	border-right-width:2px;
+	border-right-style:solid;
+	border-bottom-color:#9c9c9c;
+	border-bottom-width:1px;
+	border-bottom-style:solid;
+	background-color:#ffffff;
+	padding:2px;
+}
+
+.addBookAlphaLinks
+{
+	border-top-color:#9c9c9c;
+	border-top-width:1px;
+	border-top-style:solid;
+	border-left-color:#9c9c9c;
+	border-left-width:1px;
+	border-left-style:solid;
+	border-right-color:#9c9c9c;
+	border-right-width:1px;
+	border-right-style:solid;
+	border-bottom-color:#9c9c9c;
+	border-bottom-width:1px;
+	border-bottom-style:solid;
+}
Index: /branches/2.0/phpgwapi/templates/classic/css/idots.css
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/css/idots.css	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/css/idots.css	(revision 1196)
@@ -0,0 +1,400 @@
+/*
+StyleSheet coding standards:
+
+1. use lowercase if possible
+
+2. format styles like this:
+
+body
+{
+	font-size: 12px;
+	font-family: Verdana, Arial, Helvetica, sans-serif
+}
+
+3. existing html elements on top of the document, then all self defined .classes and at last all self defined #id's.
+
+4. close every property with ; also the last one.
+*/
+
+body 
+{
+	background-image:url(../images/body-background.png);
+	font-size: 11px; 
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	padding:3px;
+}
+
+img
+{
+	border-width:0px;
+	border-style:none;
+	/*filter:progid:DXImageTransform.Microsoft.AlphaImageLoader;
+*/
+}
+
+a:link,a:visited
+{
+	cursor:pointer;
+	color: #006699; 
+	text-decoration: none;
+}
+
+/*
+a:visited 
+{
+	color: #006699; 
+	text-decoration: none;
+}
+*/
+a:hover,a:active
+{
+	cursor:pointer;
+	color: #ff9933;
+	text-decoration: underline;
+}
+/*
+a:active 
+{
+	color: #006699; 
+	text-decoration: underline;
+}
+*/
+input,button
+{
+	font-size: 11px; 
+	color: #006699; 
+	font-family: Arial, Helvetica, sans-serif;
+	border: 1px #bbbbbb solid;
+}
+
+input[type=submit],input[type=button],button
+{
+	margin:1px;
+	padding:1px;
+	cursor: pointer; 
+	cursor: hand;
+}
+
+input[type=image]
+{
+	cursor: pointer; 
+	cursor: hand;
+	border: 0px #bbbbbb none;
+}
+select 
+{
+	font-size: 11px; 
+	color: #006699; 
+	font-family: Arial, Helvetica, sans-serif;
+	border: 1px #bbbbbb solid;
+}
+
+td
+{
+
+/* global tags should never be defined here [ndee]*/
+	font-size: 11px;
+/* removed text-align:left; [ndee]*/
+	/*	padding-top:1px;
+	padding-bottom:1px;*/
+}
+
+.divLoginbox 
+{
+	position:relative;
+	width: 300px; 
+	border-right: #9c9c9c 1px solid; 
+	border-top: #9c9c9c 1px solid; 
+	border-left: #9c9c9c 1px solid; 
+	border-bottom: #9c9c9c 1px solid
+}
+
+.divLoginboxHeader 
+{
+	text-align:center;
+	background-color:#dddddd;
+	padding-top:2px;
+	font-size:10px;
+	color:#666666;
+}
+.divSidebox 
+{
+	position:relative;
+	width: 147px; 
+	border-right: #9c9c9c 1px solid; 
+	border-top: #9c9c9c 1px solid; 
+	border-left: #9c9c9c 1px solid; 
+	border-bottom: #9c9c9c 1px solid
+}
+
+.divSideboxHeader 
+{
+	text-align:center;
+	background-color:#dddddd;
+	padding-top:2px;
+	font-size:10px;
+	color:#666666;
+}
+
+a.divSideboxEntry, .divSideboxEntry
+{
+	text-align:left;
+	height:16px;
+	background-color:#eeeeee;
+}
+
+a.appTitles,.appTitles
+{
+	font-size: 10px; 
+	height:18px;
+	padding-top:2px;
+	padding-bottom:2px;
+}
+
+a.textSidebox
+{
+	font-size: 10px; 
+	border-top: #aaaaaa 0px none;
+}
+
+.textSidebox
+{
+	font-size: 10px; 
+	height:18px;
+	padding-top:2px;
+	padding-bottom:2px;
+	border-top: #aaaaaa 1px solid;
+
+}
+
+.sideboxSpace
+{
+	height:9px;
+}
+
+.greyLine
+{
+	margin:1px;
+	border-top-color:#7e7e7e;
+	border-top-width:1px;
+	border-top-style:solid;
+	height:1px;
+}
+
+.prefSection
+{
+	font-weight:bold;
+	font-size:16px;
+	line-height:40px;
+}
+
+#extraIcons
+{
+/*	position:absolute;
+	z-index:13;
+	right:10px;
+	top:113px;
+	visibility:hidden;*/
+/*	background-image:url(../images/alpha-white.png);*/
+	background-color:#eeeeee;
+	border-width:1px;
+	border-color:#7e7e7e;
+	border-style:solid;
+}
+
+.extraIconsRow
+{
+	border-top-color:#dddddd;
+	border-top-width:1px;
+	border-top-style:solid;
+	padding:2px;
+}
+
+#divMain
+{
+	background-color:white;
+	margin-top: 5px;
+	padding:9px;
+	border-color:#7e7e7e;
+	border-width:1px;
+	border-style:solid;
+}
+
+#divLogo
+{
+	position:absolute;
+	left:20px;
+	top:5px;
+	z-index:51;
+}
+
+#divAppIconBar
+{
+	background-color:white;
+	border-top-color:#9c9c9c;
+	border-top-width:1px;
+	border-top-style:solid;
+	background-image: url(../images/background-icon-bar.png); 
+	background-repeat: repeat-x
+}
+
+#divAppTextBar
+{
+	background-color:white;
+}
+
+#divStatusBar
+{
+	background-color:white;
+	height:15px;
+	padding-left:10px;
+	margin-top: 13px;
+	/*	margin-bottom: 2px;*/
+}
+
+/*#divSubContainer
+{
+}
+*/
+#tdSidebox
+{
+	width:170px;
+	background-color:white;
+	overflow:visible;
+}
+
+
+#tdAppbox
+{
+	background-color:white;
+	padding-left:5px;
+	width: 100%;
+}
+#divSideboxContainer
+{
+	position:relative;
+	width:150px;
+	top:0px;
+	left:0px;
+	background-color:white;
+	border-width:1px;
+	border-style:solid;
+	z-index:40;
+}
+
+#divAppboxHeader
+{
+	/*width:100%;*/
+	background-image:url(../images/appbox-header-background.png);
+	background-repeat: repeat-x;
+	height:36px;
+	line-height:28px;
+	text-align:center;
+	/*	padding-top:7px;*/
+	padding-bottom:0px;
+	font-size:14px;
+	font-weight:bold;
+	color:#666666;
+	border-top-color:#9c9c9c;
+	border-top-width:1px;
+	border-top-style:solid;
+	border-left-color:#9c9c9c;
+	border-left-width:1px;
+	border-left-style:solid;
+	border-right-color:#9c9c9c;
+	border-right-width:1px;
+	border-right-style:solid;
+}
+
+#divAppbox
+{
+/*	width:100%;*/
+	background-color:#f7f7f7;
+	padding:5px;
+	border-bottom-color:#9c9c9c;
+	border-bottom-width:1px;
+	border-bottom-style:solid;
+	border-left-color:#9c9c9c;
+	border-left-width:1px;
+	border-left-style:solid;
+	border-right-color:#9c9c9c;
+	border-right-width:1px;
+	border-right-style:solid;
+}
+
+#fmStatusBar
+{
+	margin-left:4px;
+	margin-bottom:3px;
+	font-size: 10px; 
+/*	font-family: Verdana, Arial, Helvetica, sans-serif;*/
+	
+
+}
+
+
+.fmButton
+{
+	background-image:url(../images/buttonbackground.png);
+	width:28px;
+	height:28px;
+	background-repeat: no-repeat;
+}
+
+#fmLocation
+{
+	position:relative;
+	/*background-image:url(../images/buttonbackgroundscaled.png);
+	background-repeat: repeat-x;*/
+	/*margin-left:4px;*/
+	margin-bottom:3px;
+	height:27px;
+
+}
+
+#fmMenu
+{
+	position:relative;
+}
+#fmFileWindow
+{
+	background-color:#ffffff;
+	margin-left:4px;
+	padding:5px;
+	position:relative;
+	border-right: #cccccc 1px solid; 
+	border-top: #9c9c9c 2px solid; 
+	border-left: #9c9c9c 2px solid; 
+	border-bottom: #cccccc 1px solid
+}
+
+#user_info
+{
+
+
+}
+
+#admin_info
+{
+	position:relative;
+	text-align:right;
+}
+
+#divGenTime
+{
+	bottom:14px;
+	font-size: 9px;
+	color: #ff0000;
+	text-align:center;
+	width:99%;
+}
+
+#divPoweredBy 
+{
+	bottom:14px;
+	font-size: 9px;
+	color: #000000;
+	text-align:center;
+	width:99%;
+}
+
Index: /branches/2.0/phpgwapi/templates/classic/frames_body.tpl
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/frames_body.tpl	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/frames_body.tpl	(revision 1196)
@@ -0,0 +1,3 @@
+<!-- BEGIN frame_body -->
+  <frame src="{body_link}" name="phpgw_body">
+<!-- END frame_body -->
Index: /branches/2.0/phpgwapi/templates/classic/login_celepar.php
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/login_celepar.php	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/login_celepar.php	(revision 1196)
@@ -0,0 +1,378 @@
+<?php
+	/**************************************************************************\
+	* eGroupWare login                                                         *
+	* http://www.egroupware.org                                                *
+	* Originaly written by Dan Kuykendall <seek3r@phpgroupware.org>            *
+	*                      Joseph Engo    <jengo@phpgroupware.org>             *
+	* Updated by Nilton Emilio Buhrer Neto <niltonneto@celepar.pr.gov.br>      *
+	*  This program is free software; you can redistribute it and/or modify it *
+	*  under the terms of the GNU General Public License as published by the   *
+	*  Free Software Foundation; either version 2 of the License, or (at your  *
+	*  option) any later version.                                              *
+	\**************************************************************************/
+
+	function check_logoutcode($code)
+	{
+		switch($code)
+		{
+			case 1:
+				return lang('You have been successfully logged out');
+				
+			case 2:
+				return lang('Sorry, your login has expired');
+				
+			case 4:
+				return lang('Cookies are required to login to this site.');
+				
+			case 5:
+				return '<font color="FF0000">' . lang('Bad login or password') . '</font>';
+
+			case 6:
+				return '<font color="FF0000">' . lang('Your password has expired, and you do not have access to change it') . '</font>';
+				
+			case 98:
+				return '<font color="FF0000">' . lang('Account is expired') . '</font>';
+				
+			case 99:
+				return '<font color="FF0000">' . lang('Blocked, too many attempts') . '</font>';
+				
+			case 10:
+				$GLOBALS['phpgw']->session->phpgw_setcookie('sessionid');
+				$GLOBALS['phpgw']->session->phpgw_setcookie('kp3');
+				$GLOBALS['phpgw']->session->phpgw_setcookie('domain');
+
+				//fix for bug php4 expired sessions bug
+				if($GLOBALS['phpgw_info']['server']['sessions_type'] == 'php4')
+				{
+					$GLOBALS['phpgw']->session->phpgw_setcookie(PHPGW_PHPSESSID);
+				}
+
+				return '<font color="#FF0000">' . lang('Your session could not be verified.') . '</font>';
+				
+			default:
+				return '&nbsp;';
+		}
+	}
+	
+	/* Program starts here */
+
+	if($GLOBALS['phpgw_info']['server']['auth_type'] == 'http' && isset($_SERVER['PHP_AUTH_USER']))
+	{
+		$submit = True;
+		$login  = $_SERVER['PHP_AUTH_USER'];
+		$passwd = $_SERVER['PHP_AUTH_PW'];
+		$passwd_type = 'text';
+	}
+	else
+	{
+		$passwd = $_POST['passwd'];
+		$passwd_type = $_POST['passwd_type'];
+	}
+
+	# Apache + mod_ssl style SSL certificate authentication
+	# Certificate (chain) verification occurs inside mod_ssl
+	if($GLOBALS['phpgw_info']['server']['auth_type'] == 'sqlssl' && isset($_SERVER['SSL_CLIENT_S_DN']) && !isset($_GET['cd']))
+	{
+		# an X.509 subject looks like:
+		# /CN=john.doe/OU=Department/O=Company/C=xx/Email=john@comapy.tld/L=City/
+		# the username is deliberately lowercase, to ease LDAP integration
+		$sslattribs = explode('/',$_SERVER['SSL_CLIENT_S_DN']);
+		# skip the part in front of the first '/' (nothing)
+		while($sslattrib = next($sslattribs))
+		{
+			list($key,$val) = explode('=',$sslattrib);
+			$sslattributes[$key] = $val;
+		}
+
+		if(isset($sslattributes['Email']))
+		{
+			$submit = True;
+
+			# login will be set here if the user logged out and uses a different username with
+			# the same SSL-certificate.
+			if(!isset($_POST['login'])&&isset($sslattributes['Email']))
+			{
+				$login = $sslattributes['Email'];
+				# not checked against the database, but delivered to authentication module
+				$passwd = $_SERVER['SSL_CLIENT_S_DN'];
+			}
+		}
+		unset($key);
+		unset($val);
+		unset($sslattributes);
+	}
+
+	if(isset($passwd_type) || $_POST['submitit_x'] || $_POST['submitit_y'] || $submit)
+	{
+///// 	Início - Código temporário: Para renomeação de login com organização para sem. //////
+/*		$common = CreateObject('phpgwapi.common');
+		$ldap_conn = $common->ldapConnect();
+		$justthese = array("uid");
+		$filter="(&(phpgwAccountType=u)(uid=".$_POST['user']."))";
+		$ldap_search = ldap_search($ldap_conn, $GLOBALS['phpgw_info']['server']['ldap_context'], $filter, $justthese);
+		$ldap_info 	 = ldap_get_entries($ldap_conn, $ldap_search);
+		if ($ldap_info['count'] != 0) // Verifica se o login existe sem organização.
+		{
+			$_POST['login'] = $_POST['user'];
+		}
+		ldap_close($ldap_conn);*/
+/// 	Fim - Código temporário: Para renomeação de login com organização para sem. //////
+		if(getenv('REQUEST_METHOD') != 'POST' && $_SERVER['REQUEST_METHOD'] != 'POST' &&
+			!isset($_SERVER['PHP_AUTH_USER']) && !isset($_SERVER['SSL_CLIENT_S_DN']))
+		{
+			$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/login.php','cd=5'));
+		}
+		
+		// don't get login data again when $submit is true
+		if($submit == false)
+		{
+			$login = $_POST['login'];
+		}
+		
+		if(strstr($login,'@') === False && isset($_POST['logindomain']))
+		{
+			$login .= '@' . $_POST['logindomain'];
+		}
+		elseif(!isset($GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['user']['domain']]))
+		{
+			$login .= '@'.$GLOBALS['phpgw_info']['server']['default_domain'];
+		}
+		$GLOBALS['sessionid'] = $GLOBALS['phpgw']->session->create(strtolower($login),$passwd,$passwd_type,'u');
+
+		if(!isset($GLOBALS['sessionid']) || ! $GLOBALS['sessionid'])
+		{
+			$GLOBALS['phpgw']->redirect($GLOBALS['phpgw_info']['server']['webserver_url'] . '/login.php?cd=' . $GLOBALS['phpgw']->session->cd_reason);
+		}
+		else
+		{
+			if ($_POST['lang'] && preg_match('/^[a-z]{2}(-[a-z]{2}){0,1}$/',$_POST['lang']) &&
+			    $_POST['lang'] != $GLOBALS['phpgw_info']['user']['preferences']['common']['lang'])
+			{
+				$GLOBALS['phpgw']->preferences->add('common','lang',$_POST['lang'],'session');
+			}
+
+			if(!$GLOBALS['phpgw_info']['server']['disable_autoload_langfiles'])
+			{
+				$GLOBALS['phpgw']->translation->autoload_changed_langfiles();
+			}
+			$forward = isset($_GET['phpgw_forward']) ? urldecode($_GET['phpgw_forward']) : @$_POST['phpgw_forward'];
+			if (!$forward)
+			{
+				$extra_vars['cd'] = 'yes';
+				$forward = '/home.php';
+			}
+			else
+			{
+				list($forward,$extra_vars) = explode('?',$forward,2);
+			}
+			if ($GLOBALS['phpgw_info']['server']['use_https'] != 2)
+			{
+				$forward = 'http://'.$_SERVER['HTTP_HOST'].($GLOBALS['phpgw']->link($forward.'?cd=yes'));
+				echo "<script language='Javascript1.3'>location.href='".$forward."'</script>";
+			}
+			else
+			{
+				$GLOBALS['phpgw']->redirect_link($forward,$extra_vars);
+			}
+		}
+	}
+	else
+	{
+		// !!! DONT CHANGE THESE LINES !!!
+		// If there is something wrong with this code TELL ME!
+		// Commenting out the code will not fix it. (jengo)
+		if(isset($_COOKIE['last_loginid']))
+		{
+			$accounts = CreateObject('phpgwapi.accounts');
+			$prefs = CreateObject('phpgwapi.preferences', $accounts->name2id($_COOKIE['last_loginid']));
+
+			if($prefs->account_id)
+			{
+				$GLOBALS['phpgw_info']['user']['preferences'] = $prefs->read_repository();
+			}
+		}
+		if ($_GET['lang'])
+		{
+			$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] = $_GET['lang'];
+		}
+		elseif(!isset($_COOKIE['last_loginid']) || !$prefs->account_id)
+		{
+			// If the lastloginid cookies isn't set, we will default to the first language,
+			// the users browser accepts.
+			list($lang) = explode(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']);
+			/*
+			if(strlen($lang) > 2)
+			{
+				$lang = substr($lang,0,2);
+			}
+			*/
+			$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] = $lang;
+		}
+		#print 'LANG:' . $GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] . '<br>';
+
+		$GLOBALS['phpgw']->translation->init();	// this will set the language according to the (new) set prefs
+		$GLOBALS['phpgw']->translation->add_app('login');
+		$GLOBALS['phpgw']->translation->add_app('loginscreen');
+		if(lang('loginscreen_message') == 'loginscreen_message*')
+		{
+			$GLOBALS['phpgw']->translation->add_app('loginscreen','en');	// trying the en one
+		}
+		if(lang('loginscreen_message') != 'loginscreen_message*')
+		{
+			$tmpl->set_var('lang_message',stripslashes(lang('loginscreen_message')));
+		}
+	}
+
+	if($GLOBALS['phpgw_info']['server']['use_prefix_organization'])
+	{
+		$organization_select = "<tr><td width=\"66\" class=\"loginLabel\">";
+		$organization_select .= lang("organization").":</td>";
+		$organization_select .="<td width=\"135\">";											
+		$organization_select .="<select name=\"organization\">\n";		
+		
+		$obj_organization = CreateObject('phpgwapi.sector_search_ldap');
+		$organizations = $obj_organization->organization_search($GLOBALS['phpgw_info']['server']['ldap_context']);
+		
+		for ($i=0; $i<count($organizations); $i++)
+		{
+			$tmp_array[strtolower($organizations[$i])] = $organizations[$i];	
+		}
+		
+		$arrayOrganization = $tmp_array;		
+		ksort($arrayOrganization);
+		
+		foreach($arrayOrganization
+			 as $organization_name => $organization_vars)
+		{
+			$organization_select .= '<option value="' . $organization_name . '"';
+
+			if($organization_name == $_COOKIE['last_organization'])
+			{
+				$organization_select .= ' selected';
+			}
+			$organization_select .= '>' . $organization_vars . "</option>\n";
+		}
+		$organization_select .= "</select>\n";
+		$organization_select .="</td><td>&nbsp;</td></tr>";
+		$tmpl->set_var('select_organization',$organization_select);
+	}
+		
+	$domain_select = '&nbsp;';
+	$last_loginid = $_COOKIE['last_loginid'];
+	if($GLOBALS['phpgw_info']['server']['show_domain_selectbox'])
+	{
+		$domain_select = "<select name=\"logindomain\">\n";
+		foreach($GLOBALS['phpgw_domain'] as $domain_name => $domain_vars)
+		{
+			$domain_select .= '<option value="' . $domain_name . '"';
+
+			if($domain_name == $_COOKIE['last_domain'])
+			{
+				$domain_select .= ' selected';
+			}
+			$domain_select .= '>' . $domain_name . "</option>\n";
+		}
+		$domain_select .= "</select>\n";
+	}
+	elseif($last_loginid !== '')
+	{
+		reset($GLOBALS['phpgw_domain']);
+		list($default_domain) = each($GLOBALS['phpgw_domain']);
+
+		if($_COOKIE['last_domain'] != $default_domain && !empty($_COOKIE['last_domain']))
+		{
+			$last_loginid .= '@' . $_COOKIE['last_domain'];
+		}
+	}
+	$tmpl->set_var('select_domain',$domain_select);
+
+	foreach($_GET as $name => $value)
+	{
+		if(ereg('phpgw_',$name))
+		{
+			$extra_vars .= '&' . $name . '=' . urlencode($value);
+		}
+	}
+
+	if($extra_vars)
+	{
+		$extra_vars = '?' . substr($extra_vars,1);
+	}
+
+	/********************************************************\
+	* Check is the registration app is installed, activated  *
+	* And if the register link must be placed                *
+	\********************************************************/
+	
+	$cnf_reg = createobject('phpgwapi.config','registration');
+	$cnf_reg->read_repository();
+	$config_reg = $cnf_reg->config_data;
+
+	if($config_reg[enable_registration]=='True' && $config_reg[register_link]=='True')
+	{
+		$reg_link='&nbsp;<a href="registration/">'.lang('Not a user yet? Register now').'</a><br/>';
+	}
+
+	$GLOBALS['phpgw_info']['server']['template_set'] = $GLOBALS['phpgw_info']['login_template_set'];
+
+	$tmpl->set_var('register_link',$reg_link);
+	$tmpl->set_var('charset',$GLOBALS['phpgw']->translation->charset());
+	$tmpl->set_var('login_url', $GLOBALS['phpgw_info']['server']['webserver_url'] . '/login.php' . $extra_vars);
+	$tmpl->set_var('registration_url',$GLOBALS['phpgw_info']['server']['webserver_url'] . '/registration/');
+	$tmpl->set_var('version',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
+	$tmpl->set_var('cd',check_logoutcode($_GET['cd']));
+	$tmpl->set_var('cookie',$last_loginid);
+
+	$tmpl->set_var('lang_username',lang('username'));
+	$tmpl->set_var('lang_password',lang('password'));
+	$tmpl->set_var('lang_login',lang('login'));
+
+	$tmpl->set_var('website_title', $GLOBALS['phpgw_info']['server']['site_title']);
+	$tmpl->set_var('template_set',$GLOBALS['phpgw_info']['login_template_set']);
+	$tmpl->set_var('bg_color',($GLOBALS['phpgw_info']['server']['login_bg_color']?$GLOBALS['phpgw_info']['server']['login_bg_color']:'FFFFFF'));
+	$tmpl->set_var('bg_color_title',($GLOBALS['phpgw_info']['server']['login_bg_color_title']?$GLOBALS['phpgw_info']['server']['login_bg_color_title']:'486591'));
+
+	if($GLOBALS['phpgw_info']['server']['use_frontend_name'])
+		$tmpl->set_var('frontend_name', " - ".$GLOBALS['phpgw_info']['server']['use_frontend_name']);
+
+	if (substr($GLOBALS['phpgw_info']['server']['login_logo_file'],0,4) == 'http')
+	{
+		$var['logo_file'] = $GLOBALS['phpgw_info']['server']['login_logo_file'];
+	}
+	else
+	{
+		$var['logo_file'] = $GLOBALS['phpgw']->common->image('phpgwapi',$GLOBALS['phpgw_info']['server']['login_logo_file']?$GLOBALS['phpgw_info']['server']['login_logo_file']:'logo');
+	}
+	$var['logo_url'] = $GLOBALS['phpgw_info']['server']['login_logo_url']?$GLOBALS['phpgw_info']['server']['login_logo_url']:'http://www.eGroupWare.org';
+	if (substr($var['logo_url'],0,4) != 'http')
+	{
+		$var['logo_url'] = 'http://'.$var['logo_url'];
+	}
+	$var['logo_title'] = $GLOBALS['phpgw_info']['server']['login_logo_title']?$GLOBALS['phpgw_info']['server']['login_logo_title']:'www.eGroupWare.org';
+	$tmpl->set_var($var);
+
+	if (@$GLOBALS['phpgw_info']['server']['login_show_language_selection'])
+	{
+		$select_lang = '<select name="lang" onchange="'."location.href=location.href+(location.search?'&':'?')+'lang='+this.value".'">';
+		$langs = $GLOBALS['phpgw']->translation->get_installed_langs();
+		uasort($langs,'strcasecmp');
+		foreach ($langs as $key => $name)	// if we have a translation use it
+		{
+			$select_lang .= "\n\t".'<option value="'.$key.'"'.($key == $GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] ? ' selected="1"' : '').'>'.$name.'</option>';
+		}
+		$select_lang .= "\n</select>\n";
+		$tmpl->set_var(array(
+			'lang_language' => lang('Language'),
+			'select_language' => $select_lang,
+		));
+	}
+	else
+	{
+		$tmpl->set_block('login_form','language_select');
+		$tmpl->set_var('language_select','');
+	}
+
+	$tmpl->set_var('autocomplete', ($GLOBALS['phpgw_info']['server']['autocomplete_login'] ? 'autocomplete="off"' : ''));
+
+	$tmpl->pfp('loginout','login_form');
+?>
Index: /branches/2.0/phpgwapi/templates/classic/history_list.tpl
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/history_list.tpl	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/history_list.tpl	(revision 1196)
@@ -0,0 +1,28 @@
+<!-- BEGIN row_no_history -->
+	<tr bgcolor="{tr_color}">
+		<td align="center" colspan="5"><b>{lang_no_history}</b></td>
+	</tr>
+<!-- END row_no_history -->
+
+<!-- BEGIN row -->
+	<tr bgcolor="{tr_color}">
+		<td>&nbsp;{row_date}</td>
+		<td>&nbsp;{row_owner}</td>
+		<td>&nbsp;{row_status}</td>
+		<td>&nbsp;{row_old_value}</td>
+		<td>&nbsp;{row_new_value}</td>
+	</tr>
+<!-- END row -->
+
+<!-- BEGIN list -->
+<table border="0" width="95%">
+	<tr bgcolor="{th_bg}">
+		<td>{sort_date}</td>
+		<td>{sort_owner}</td>
+		<td>{sort_status}</td>
+		<td>{sort_old_value}</td>
+		<td>{sort_new_value}</td>
+	</tr>
+{rows}
+</table>
+<!-- END list -->
Index: /branches/2.0/phpgwapi/templates/classic/listUsers.tpl
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/listUsers.tpl	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/listUsers.tpl	(revision 1196)
@@ -0,0 +1,51 @@
+
+<html>
+	<head>
+		<title>{lang_Add_Participants}</title>
+		<script src='js/listUsers.js' type='text/javascript'></script>
+	</head>
+	<body>
+		<form name="formAddUser" method="POST">	
+		 <center>	
+		  <table cellspacing="3" cellpadding="3">														
+		   <tr>
+			 <td>
+			  <div id="divAppboxHeader">{lang_Add_Participants}</div>
+			  <div id="divAppbox">
+			   <table border=0>
+				<tr><td>{lang_Organization}:</td></tr>
+				<tr><td><select name="select_organization" onchange="formAddUser.change_organization.value='True';formAddUser.submit()">.{combo_organization}.</select></td></tr>
+				<tr><td>{lang_Sector}:</td></tr>
+				<tr><td><select name="select_sector" onchange="formAddUser.submit()">.{combo_sector}.</select></td></tr>
+				<input type="hidden" name="change_organization" value="False">
+				<tr>
+				 <td>
+				  <select name="user_values" multiple style="width:250px" size="18" id="user_list_in">
+				  {options}
+				  </select>					
+				 </td>
+			    </tr>
+				<tr><td>&nbsp;</td>	</tr>
+				<tr>
+				 <td>   			
+				  <!--center>{lang_to_Search}:&nbsp;<input type="text" name="query" onkeyup="optionFinder(this)"></center-->   			
+				 </td>
+				</tr>				
+				<tr><td>&nbsp;</td>	</tr>
+				<tr>
+				 <td>
+				  <center>
+				   <input type="button" class="button" value="Adicionar" onClick="{addUser}">
+				   <input type="button" value="Fechar" onClick="javascript:window.close()">
+				  </center>
+				 </td>
+				</tr>		
+			   </table>
+			  </div>
+			 </td>	
+			</tr>
+		   </table>
+		  </center>				
+		 </form>
+	</body>
+</html>
Index: /branches/2.0/phpgwapi/templates/classic/footer.tpl
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/footer.tpl	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/footer.tpl	(revision 1196)
@@ -0,0 +1,8 @@
+		 							</td></tr></table>
+									</div>
+		  <!-- Applicationbox Column -->
+		  </td>
+		  </tr>
+  </table>
+</div>
+<!-- END footer.tpl -->
Index: /branches/2.0/phpgwapi/templates/classic/addressbook.tpl
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/addressbook.tpl	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/addressbook.tpl	(revision 1196)
@@ -0,0 +1,94 @@
+<script type="text/javascript">
+	function Exchange(thisform,field)
+	{
+		if (opener.document.doit[field].value != '')
+		{
+			opener.document.doit[field].value += ',';
+		}
+		opener.document.doit[field].value += thisform.elements.email.value;
+	}
+</script>
+<div id="divMain">
+<p align="center">{message}</p>
+<p align="center">{lang_showing}<br>
+<table border="0" width="100%">
+	<tr valign="top">
+		{left}
+<form action="{form_action}" name="form" method="POST">
+		<td align="left">
+			<select name="cat_id" onChange="this.form.submit();"><option value="">{lang_select_cats}</option>{cats_list}</select>
+			<noscript>&nbsp;<input type="submit" name="cat" value="{lang_submit}"></noscript>
+		</td>
+		<td align="center">
+			<input type="text" size="10" name="query" value="{query}">
+			<input type="submit" name="search" value="{lang_search}">
+		</td>
+		<td align="right">
+			<select name="filter" onChange="this.form.submit();">
+				{filter_list}
+			</select>
+		</td>
+</form>
+		{right}
+	</tr>
+</table>
+<table border="0" width="100%" cellpadding="2" cellspacing="2">
+	<tr class="th">
+		<td width="40%" colspan="2">
+			{sort_org_name}
+		</td>
+<form action="{form_action}" name="form" method="POST">
+		<td width="30%" align="center" rowspan="2">
+			{lang_email}<br>
+			<input type="submit" name="all[wto]" value="{to}" title="{title_work_to}">
+			<input type="submit" name="all[wcc]" value="{cc}" title="{title_work_cc}">
+			<input type="submit" name="all[wbcc]" value="{bcc}" title="{title_work_bcc}">
+		</td>
+		<td width="30%" align="center" rowspan="2">
+			{lang_hemail}<br>
+			<input type="submit" name="all[hto]" value="{to}" title="{title_home_to}">
+			<input type="submit" name="all[hcc]" value="{cc}" title="{title_home_cc}">
+			<input type="submit" name="all[hbcc]" value="{bcc}" title="{title_home_bcc}">
+		</td>
+</form>
+	</tr>
+	<tr class="th">
+		<td>{sort_n_family}</td>
+		<td>{sort_n_given}</td>
+	</tr>
+
+  <!-- BEGIN addressbook_list -->
+	<tr class="{tr_class}">
+		<td colspan="2">{company}</td>
+<form>
+		<td align="center" rowspan="2">
+			<input type="text" style="width: 100%" name="email" value="{email}"><br>
+			<input type="button" name="to" value="{to}" onClick="Exchange(this.form,'to');">
+			<input type="button" name="cc" value="{cc}" onClick="Exchange(this.form,'cc');">
+			<input type="button" name="bcc" value="{bcc}" onClick="Exchange(this.form,'bcc');">
+		</td>
+</form>
+<form>
+		<td align="center" rowspan="2">
+			<input type="text" style="width: 100%" name="email" value="{hemail}"><br>
+			<input type="button" name="to" value="{to}" onClick="Exchange(this.form,'to');">
+			<input type="button" name="cc" value="{cc}" onClick="Exchange(this.form,'cc');">
+			<input type="button" name="bcc" value="{bcc}" onClick="Exchange(this.form,'bcc');">
+		</td>
+</form>
+	</tr>
+	<tr class="{tr_class}">
+		<td>{lastname}</td>
+		<td>{firstname}</td>
+	</tr>
+<!-- END addressbook_list -->
+
+	<tr>
+		<td colspan="4" align="center" valign="bottom">
+			<br><form><input type="button" name="done" value="{lang_done}" onClick="window.close()"></form>
+		</td>
+	</tr>
+</table>
+</div>
+</body>
+</html>
Index: /branches/2.0/phpgwapi/templates/classic/portal.tpl
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/portal.tpl	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/portal.tpl	(revision 1196)
@@ -0,0 +1,42 @@
+<!-- BEGIN portal_box -->
+<div style="border: 1px solid #adc9d8;border-top:0px">
+<table border="0" cellpadding="0" cellspacing="0" width="{outer_width}"  height="100%"> 
+ <tr nowrap align="center">
+  <td style="height:19px;border-top:0px;padding:1px;vertical-align:top;background: #fff url(phpgwapi/templates/celepar/images/bgBlockTitle.png)" align="left" nowrap>&nbsp;<font size="2.0em" color="#003366">{title}</font></td>
+ </tr>
+ <tr>
+  <td style='background: #fff url(phpgwapi/templates/celepar/images/bgBlockContent.jpg);background-attachment:scroll;background-repeat:repeat-x;border-top:0px solid #adc9d8'>
+   <table border="0" cellpadding="0" height="100%" cellspacing="5" width="{inner_width}">
+    {row}
+   </table>
+  </td>
+ </tr>
+</table>
+</div>
+<!-- END portal_box -->
+<!-- BEGIN portal_row -->
+    <tr>
+	  <td >
+		{output}
+	  </td>
+    </tr>
+<!-- END portal_row -->
+<!-- BEGIN portal_listbox_header -->
+	<tr>
+	 <td>
+	  <ul>
+<!-- END portal_listbox_header -->
+<!-- BEGIN portal_listbox_link -->
+<li><a href="{link}">{text}</a></li>
+<!-- END portal_listbox_link -->
+<!-- BEGIN portal_listbox_footer -->
+	  </ul>
+	 </td>
+	</tr>
+<!-- END portal_listbox_footer -->
+<!-- BEGIN portal_control -->
+  <td valign="middle" align="right" nowrap="nowrap">{control_link}</td>
+<!-- END portal_control -->
+<!-- BEGIN link_field -->
+   {link_field_data}
+<!-- END link_field -->
Index: /branches/2.0/phpgwapi/templates/classic/login.css
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/login.css	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/login.css	(revision 1196)
@@ -0,0 +1,58 @@
+body{
+	margin-top: 0;
+	margin-bottom: 0;
+	margin-left: 0;
+	margin-right: 0; 
+	padding-top: 0;
+	padding-bottom: 0;
+	padding-left: 0;
+	padding-right: 0;
+}
+
+.login {
+	text-align:center;
+	background-color: #F7F7F7;
+	border: 1px solid #CCCCCC;
+	margin: 5px 5px 50px;
+	padding: 5px;
+	height: 116px;
+	width: 300px;
+}
+.msgInicial {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #000066;
+	font-weight: bold;
+	padding-top: 70px;
+}
+input {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 10px;
+	color: #006699;
+	border: 1px solid #000066;
+}
+select {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 10px;
+	color: #006699;
+	background-color: #FFFFFF;
+	border: 1px solid #000066;
+}
+.button {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 10px;
+	color: 006699;
+	background-color: #D4D0C8;
+	border: 1px solid #666666;
+}
+.loginLabel {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 10px;
+	color: #000066;
+	padding-left: 15px;
+}
+.tableLogin {
+	padding: 1px;
+	width: 274px;
+}
+
Index: /branches/2.0/phpgwapi/templates/classic/head.inc.php
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/head.inc.php	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/head.inc.php	(revision 1196)
@@ -0,0 +1,1 @@
+link ../default/head.inc.php
Index: /branches/2.0/phpgwapi/templates/classic/head.tpl
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/head.tpl	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/head.tpl	(revision 1196)
@@ -0,0 +1,26 @@
+<!-- BEGIN head -->
+<html xml:lang="{lang_code}" xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>{website_title}</title>
+		<meta http-equiv="content-type" content="text/html; charset={charset}" />
+		<meta name="keywords" content="eGroupWare" />
+		<meta name="description" content="eGroupware" />
+		<meta name="keywords" content="eGroupWare" />
+		<meta name="copyright" content="eGroupWare http://www.egroupware.org (c) 2003" />
+		<meta name="language" content="{lang_code}" />
+		<meta name="author" content="eGroupWare http://www.egroupware.org" />
+		<meta name="robots" content="none" />
+		<link rel="icon" href="{img_icon}" type="image/x-ico" />
+		<link rel="shortcut icon" href="{img_shortcut}" />
+		<link href="{theme_css}" title="eGroupWareStyle" type="text/css" rel="StyleSheet"/>
+		<META http-equiv="Default-Style" content="eGroupWareStyle">
+		{slider_effects}
+		{simple_show_hide}
+		{pngfix}
+		{css}
+		{java_script}
+		{cookie_manager}
+	</head>
+	<!-- we don't need body tags anymore, do we?) we do!!! onload!! LK -->
+	<body {body_tags}>
+<!-- END head -->
Index: /branches/2.0/phpgwapi/templates/classic/accounts_popup.tpl
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/accounts_popup.tpl	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/accounts_popup.tpl	(revision 1196)
@@ -0,0 +1,156 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<HTML LANG="en">
+<head>
+<title>{title}</title>
+<meta http-equiv="content-type" content="text/html"; charset="{charset}">
+
+<script LANGUAGE="JavaScript">
+	var userSelectBox = opener.document.forms["app_form"].elements['{select_name};
+
+	function ExchangeAccountSelect(thisform)
+	{
+		NewEntry = new Option(thisform.elements['accountdisplay'].value,thisform.elements['accountid'].value,false,true);
+ 		userSelectBox.options[userSelectBox.length] = NewEntry;
+	}
+</script>
+<script LANGUAGE="JavaScript">
+	function ExchangeAccountText(thisform)
+	{
+		opener.document.app_form.accountid.value = thisform.elements['accountid'].value;
+		opener.document.app_form.accountname.value = thisform.elements['accountdisplay'].value;
+	}
+</script>
+<link rel="stylesheet" type="text/css" href="{css_file}">
+</head>
+<body>
+<center>
+<table border="0" width="100%">
+	<tr>
+		<td colspan="4">
+			<table border="0" width="100%">
+				<tr>
+				{left}
+					<td align="center"><font face="{font}">{lang_showing}</font></td>
+				{right}
+				</tr>
+			</table>
+		</td>
+	</tr>
+	<tr>
+		<td width="100%" colspan="4" align="right">
+			<form method="POST" action="{search_action}">
+			<input type="text" name="query">&nbsp;<input type="submit" name="search" value="{lang_search}">
+			</form>
+		</td>
+	</tr>
+</table>
+
+<table border="0" width="100%" cellpadding="0" cellspacing="0">
+	<tr>
+		<td valign="top" width="20%">
+			<table border="0" width="100%" cellpadding="2" cellspacing="2">
+				<tr>
+					<td bgcolor="{th_bg}" colspan="2" align="center"><font face="{font}"><b>{lang_groups}</b></font></td>
+				</tr>
+<!-- BEGIN bla_intro -->
+				<tr>
+					<td bgcolor="{th_bg}" colspan="2"><font face="{font}">{lang_perm}</font></td>
+				</tr>
+
+<!-- END bla_intro -->
+
+<!-- BEGIN other_intro -->
+				<tr>
+					<td bgcolor="{th_bg}" colspan="2"><font face="{font}">{lang_perm}</font></td>
+				</tr>
+<!-- END other_intro -->
+
+<!-- BEGIN group_cal -->
+				<tr bgcolor="{tr_color}">
+					<td><a href="{link_user_group}"><font face="{font}">{name_user_group}</font></a></td>
+					<td align="center">
+					<form>
+						<input type="hidden" name="accountid" value="{accountid}">
+						<input type="hidden" name="accountdisplay" value="{account_display}">
+						<input type="image" src="{img}" onClick="{js_function}(this.form); return false;" name="{lang_select_group}" title="{lang_select_group}">
+					</form>
+					</td>
+				</tr>
+<!-- END group_cal -->
+
+<!-- BEGIN group_other -->
+
+				<tr bgcolor="{tr_color}">
+					<td><a href="{link_user_group}"><font face="{font}">{name_user_group}</font></a></td>
+				</tr>
+
+<!-- END group_other -->
+
+<!-- BEGIN all_intro -->
+				<tr height="5">
+					<td>&nbsp;</td>
+				</tr>
+				<tr>
+					<td bgcolor="{th_bg}" colspan="2"><font face="{font}">{lang_nonperm}</font></td>
+				</tr>
+
+<!-- END all_intro -->
+
+<!-- BEGIN group_all -->
+
+				<tr bgcolor="{tr_color}">
+					<td colspan="2"><a href="{link_all_group}"><font face="{font}">{name_all_group}</font></a></td>
+				</tr>
+
+<!-- END group_all -->
+
+
+			</table>
+		</td>
+		<td width="80%" valign="top">
+			<table border="0" width="100%" cellpadding="2" cellspacing="2">
+				<tr bgcolor="{th_bg}">
+					<td width="100%" bgcolor="{th_bg}" align="center" colspan="4"><font face="{font}"><b>{lang_accounts}</b></font></td>
+				</tr>
+				<tr bgcolor="{th_bg}">
+					<td width="30%" bgcolor="{th_bg}" align="center"><font face="{font}">{sort_lid}</font></td>
+					<td width="30%" bgcolor="{th_bg}" align="center"><font face="{font}">{sort_firstname}</font></td>
+					<td width="30%" bgcolor="{th_bg}" align="center"><font face="{font}">{sort_lastname}</font></td>
+					<td width="10%" bgcolor="{th_bg}">&nbsp;</td>
+				</tr>
+
+<!-- BEGIN accounts_list -->
+
+	<tr bgcolor="{tr_color}">
+		<td><font face="{font}">{lid}</font></td>
+		<td><font face="{font}">{firstname}</font></td>
+		<td><font face="{font}">{lastname}</font></td>
+		<form>
+			<input type="hidden" name="accountid" value="{accountid}">
+			<input type="hidden" name="accountdisplay" value="{account_display}">
+			<td align="center">
+				<input type="image" src="{img}" onClick="{js_function}(this.form); return false;" name="{lang_select_user}" title="{lang_select_user}"></td>
+		</form>
+	</tr>
+
+<!-- END accounts_list -->
+
+			</table>
+		</td>
+	</tr>
+</table>
+<table cellpadding="2" cellspacing="2">
+	<tr> 
+		<form>  
+			<input type="hidden" name="start" value="{start}">
+			<input type="hidden" name="sort" value="{sort}">
+			<input type="hidden" name="order" value="{order}">
+			<input type="hidden" name="query" value="{query}">
+			<input type="hidden" name="group_id" value="{group_id}">
+			<td><font face="{font}"><input type="button" name="Done" value="{lang_done}" onClick="window.close()"></font></td>
+		</form>
+	</tr>
+</table>
+</center>
+</body>
+</html>
Index: /branches/2.0/phpgwapi/templates/classic/source/logo.svg
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/source/logo.svg	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/source/logo.svg	(revision 1196)
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
+<svg
+   i:viewOrigin="87 453"
+   i:rulerOrigin="0 0"
+   i:pageBounds="0 842 595 0"
+   width="420.467"
+   height="66.227"
+   viewBox="0 0 420.467 66.227"
+   style="overflow:visible;enable-background:new 0 0 420.467 66.227"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:ns="http://ns.adobe.com/Variables/1.0/"
+   xmlns:ns0="http://ns.adobe.com/SaveForWeb/1.0/"
+   xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/"
+   xmlns:xml="http://www.w3.org/XML/1998/namespace"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   id="svg548"
+   sodipodi:version="0.33pre"
+   sodipodi:docname="/home/pim/Desktop/E-GROUPW.EPS.svg"
+   sodipodi:docbase="/home/pim/Desktop/">
+  <defs
+     id="defs564" />
+  <sodipodi:namedview
+     id="base" />
+  <metadata
+     id="metadata549">
+    <ns:variableSets>
+      <ns:variableSet
+         varSetName="binding1"
+         locked="none">
+        <ns:variables />
+        <ns:sampleDataSets />
+      </ns:variableSet>
+    </ns:variableSets>
+    <ns0:sfw>
+      <ns0:slices />
+      <ns0:sliceSourceBounds
+         y="386.773"
+         x="87"
+         width="420.467"
+         height="66.227"
+         bottomLeftOrigin="true" />
+    </ns0:sfw>
+  </metadata>
+  <g
+     id="Layer_1"
+     i:layer="yes"
+     i:dimmedPercent="50"
+     i:rgbTrio="#4F008000FFFF"
+     transform="translate(0.627537,-79.70049)"
+     style="fill:#002572;fill-opacity:0.996078;">
+    <g
+       id="g551"
+       style="fill:#002572;fill-opacity:0.996078;">
+      <path
+         i:knockout="Off"
+         style="fill:#002572;fill-opacity:0.996078;"
+         d="M107.059,31.714v-7.821H88.404v6.601H99.31v2.871     c0,3.301-0.718,5.883-2.583,8.035c-2.009,2.297-4.951,3.588-8.323,3.588c-3.014,0-5.74-1.148-7.534-3.084     c-2.512-2.727-3.085-5.67-3.085-15.93s0.574-13.13,3.085-15.857c1.793-1.938,4.52-3.157,7.534-3.157     c5.74,0,9.471,3.301,10.763,8.897h7.821C105.553,7.104,99.238,0,88.404,0c-5.453,0-9.902,1.938-13.417,5.453     c-5.023,5.023-4.951,10.691-4.951,20.521c0,9.831-0.072,15.499,4.951,20.522c3.516,3.516,8.108,5.453,13.417,5.453     c5.381,0,10.188-1.723,14.063-5.812C105.839,42.549,107.059,38.316,107.059,31.714z"
+         id="path552" />
+      <path
+         i:knockout="Off"
+         style="fill:#002572;fill-opacity:0.996078;"
+         d="M141.99,18.153c-2.511-2.511-5.166-3.444-8.682-3.444     c-4.09,0-7.821,1.794-9.687,4.377V15.14h-7.175v36.378h7.319V29.418c0-5.022,3.301-8.18,7.247-8.18     c2.511,0,3.803,0.79,5.453,2.439L141.99,18.153z"
+         id="path553" />
+      <path
+         i:knockout="Off"
+         style="fill-rule:evenodd;clip-rule:evenodd;fill:#002572;fill-opacity:0.996078;"
+         d="M173.977,33.293     c0-6.099-0.861-10.691-4.305-14.278c-2.368-2.44-5.956-4.305-10.906-4.305c-4.951,0-8.467,1.865-10.834,4.305     c-3.444,3.587-4.305,8.18-4.305,14.278c0,6.17,0.861,10.764,4.305,14.35c2.368,2.441,5.883,4.307,10.834,4.307     c4.951,0,8.539-1.865,10.906-4.307C173.116,44.057,173.977,39.463,173.977,33.293z M166.658,33.293     c0,3.947-0.287,7.75-2.511,9.975c-1.363,1.361-3.229,2.152-5.381,2.152c-2.153,0-3.947-0.791-5.31-2.152     c-2.225-2.225-2.511-6.027-2.511-9.975c0-3.946,0.287-7.749,2.511-9.974c1.363-1.363,3.157-2.081,5.31-2.081     c2.152,0,4.018,0.717,5.381,2.081C166.371,25.544,166.658,29.347,166.658,33.293z"
+         id="path554" />
+      <path
+         i:knockout="Off"
+         style="fill:#002572;fill-opacity:0.996078;"
+         d="M211.836,51.518V15.14h-7.319v22.171c0,5.598-3.444,8.109-7.534,8.109     c-4.09,0-7.319-2.439-7.319-8.109V15.14h-7.319v23.247c0,4.09,0.861,7.535,3.66,10.262c2.152,2.08,5.238,3.301,8.969,3.301     c3.66,0,7.175-1.363,9.687-4.09v3.658H211.836z"
+         id="path555" />
+      <path
+         i:knockout="Off"
+         style="fill-rule:evenodd;clip-rule:evenodd;fill:#002572;fill-opacity:0.996078;"
+         d="M252.07,33.293     c0-5.525-0.431-11.695-4.09-15.355c-2.01-2.009-5.238-3.229-8.897-3.229c-3.946,0-6.889,1.004-9.615,4.305V15.14h-7.175v51.087     h7.318V47.787c2.655,3.156,5.669,4.162,9.543,4.162c3.66,0,6.816-1.221,8.826-3.23C251.64,45.061,252.07,38.818,252.07,33.293z      M244.751,33.293c0,6.457-0.933,12.127-7.533,12.127c-6.602,0-7.606-5.67-7.606-12.127c0-6.458,1.005-12.054,7.606-12.054     C243.818,21.239,244.751,26.835,244.751,33.293z"
+         id="path556" />
+      <path
+         i:knockout="Off"
+         style="fill:#002572;fill-opacity:0.996078;"
+         d="M318.137,0.431h-8.18l-8.897,36.522L290.799,0.431h-6.242l-10.261,36.522     l-8.897-36.522h-8.18l13.346,51.087h6.745l10.332-35.804l10.404,35.804h6.744L318.137,0.431z"
+         id="path557" />
+      <path
+         i:knockout="Off"
+         style="fill-rule:evenodd;clip-rule:evenodd;fill:#002572;fill-opacity:0.996078;"
+         d="M352.485,51.518V27.194     c0-8.251-5.022-12.485-14.996-12.485c-6.027,0-9.614,1.22-13.059,5.238l4.808,4.521c2.009-2.583,3.946-3.516,7.964-3.516     c5.668,0,7.965,2.225,7.965,6.816v2.583h-9.615c-8.323,0-12.557,4.377-12.557,10.475c0,3.086,1.005,5.885,2.87,7.822     c2.225,2.225,5.238,3.301,9.759,3.301s7.031-1.076,9.687-3.732v3.301H352.485z M345.167,38.387c0,2.584-0.503,4.307-1.579,5.383     c-1.938,1.865-4.018,2.08-6.816,2.08c-4.592,0-6.673-1.865-6.673-5.166s2.225-5.238,6.53-5.238h8.538V38.387z"
+         id="path558" />
+      <path
+         i:knockout="Off"
+         style="fill:#002572;fill-opacity:0.996078;"
+         d="M386.687,18.153c-2.512-2.511-5.166-3.444-8.683-3.444     c-4.09,0-7.82,1.794-9.687,4.377V15.14h-7.175v36.378h7.319V29.418c0-5.022,3.3-8.18,7.246-8.18c2.512,0,3.804,0.79,5.453,2.439     L386.687,18.153z"
+         id="path559" />
+      <path
+         i:knockout="Off"
+         style="fill-rule:evenodd;clip-rule:evenodd;fill:#002572;fill-opacity:0.996078;"
+         d="M420.467,35.445v-3.229     c0-10.333-5.668-17.507-15.427-17.507c-9.327,0-15.427,6.816-15.427,18.583c0,13.848,7.247,18.656,16.359,18.656     c6.387,0,9.902-1.938,13.633-5.67l-4.663-4.375c-2.583,2.582-4.736,3.73-8.826,3.73c-5.955,0-9.256-3.947-9.256-10.189H420.467z      M413.22,30.351H396.86c0.072-2.224,0.215-3.3,0.933-4.951c1.148-2.727,3.804-4.592,7.247-4.592c3.444,0,6.027,1.866,7.175,4.592     C412.933,27.051,413.148,28.127,413.22,30.351z"
+         id="path560" />
+      <path
+         i:knockout="Off"
+         style="fill:#002572;fill-opacity:0.996078;"
+         d="M24.039,21.584h20.644c0.976,0,1.767,0.791,1.767,1.767v3.934     c0,0.976-0.791,1.766-1.767,1.766H24.039c-0.976,0-1.767-0.791-1.767-1.766v-3.934C22.272,22.375,23.063,21.584,24.039,21.584z"
+         id="path561" />
+      <path
+         i:knockout="Off"
+         style="fill-rule:evenodd;clip-rule:evenodd;fill:#002572;fill-opacity:0.996078;"
+         d="M7.285,7.937V44.27h25.508h0.019h0.305     c0.355,0,1.555,0.416,1.558,1.311l0.009,0.656l-0.002,3.936c0.002,0.867-1.204,1.311-1.558,1.311l-2.175,0.004H3.069     C1.851,51.496,0,49.66,0,48.459V3.736C0,2.21,2.095,0.7,3.329,0.709h29.472h0.002h0.305c0.354,0,1.554,0.416,1.558,1.312     l-0.006,0.653v3.951c0.002,0.868-1.203,1.311-1.558,1.311h-0.305L7.285,7.937z"
+         id="path562" />
+    </g>
+  </g>
+  <g
+     id="g565"
+     i:layer="yes"
+     i:dimmedPercent="50"
+     i:rgbTrio="#4F008000FFFF"
+     transform="matrix(0.962096,0.000000,0.000000,0.962096,7.530728,1.882702)"
+     style="fill:#2572fe;fill-opacity:1;overflow:visible;enable-background:new 0 0 420.467 66.227;">
+    <g
+       id="g566"
+       style="fill:#2572fe;fill-opacity:1;">
+      <path
+         i:knockout="Off"
+         style="fill:#2572fe;fill-opacity:1;"
+         d="M107.059,31.714v-7.821H88.404v6.601H99.31v2.871     c0,3.301-0.718,5.883-2.583,8.035c-2.009,2.297-4.951,3.588-8.323,3.588c-3.014,0-5.74-1.148-7.534-3.084     c-2.512-2.727-3.085-5.67-3.085-15.93s0.574-13.13,3.085-15.857c1.793-1.938,4.52-3.157,7.534-3.157     c5.74,0,9.471,3.301,10.763,8.897h7.821C105.553,7.104,99.238,0,88.404,0c-5.453,0-9.902,1.938-13.417,5.453     c-5.023,5.023-4.951,10.691-4.951,20.521c0,9.831-0.072,15.499,4.951,20.522c3.516,3.516,8.108,5.453,13.417,5.453     c5.381,0,10.188-1.723,14.063-5.812C105.839,42.549,107.059,38.316,107.059,31.714z"
+         id="path567" />
+      <path
+         i:knockout="Off"
+         style="fill:#2572fe;fill-opacity:1;"
+         d="M141.99,18.153c-2.511-2.511-5.166-3.444-8.682-3.444     c-4.09,0-7.821,1.794-9.687,4.377V15.14h-7.175v36.378h7.319V29.418c0-5.022,3.301-8.18,7.247-8.18     c2.511,0,3.803,0.79,5.453,2.439L141.99,18.153z"
+         id="path568" />
+      <path
+         i:knockout="Off"
+         style="fill-rule:evenodd;clip-rule:evenodd;fill:#2572fe;fill-opacity:1;"
+         d="M173.977,33.293     c0-6.099-0.861-10.691-4.305-14.278c-2.368-2.44-5.956-4.305-10.906-4.305c-4.951,0-8.467,1.865-10.834,4.305     c-3.444,3.587-4.305,8.18-4.305,14.278c0,6.17,0.861,10.764,4.305,14.35c2.368,2.441,5.883,4.307,10.834,4.307     c4.951,0,8.539-1.865,10.906-4.307C173.116,44.057,173.977,39.463,173.977,33.293z M166.658,33.293     c0,3.947-0.287,7.75-2.511,9.975c-1.363,1.361-3.229,2.152-5.381,2.152c-2.153,0-3.947-0.791-5.31-2.152     c-2.225-2.225-2.511-6.027-2.511-9.975c0-3.946,0.287-7.749,2.511-9.974c1.363-1.363,3.157-2.081,5.31-2.081     c2.152,0,4.018,0.717,5.381,2.081C166.371,25.544,166.658,29.347,166.658,33.293z"
+         id="path569" />
+      <path
+         i:knockout="Off"
+         style="fill:#2572fe;fill-opacity:1;"
+         d="M211.836,51.518V15.14h-7.319v22.171c0,5.598-3.444,8.109-7.534,8.109     c-4.09,0-7.319-2.439-7.319-8.109V15.14h-7.319v23.247c0,4.09,0.861,7.535,3.66,10.262c2.152,2.08,5.238,3.301,8.969,3.301     c3.66,0,7.175-1.363,9.687-4.09v3.658H211.836z"
+         id="path570" />
+      <path
+         i:knockout="Off"
+         style="fill-rule:evenodd;clip-rule:evenodd;fill:#2572fe;fill-opacity:1;"
+         d="M252.07,33.293     c0-5.525-0.431-11.695-4.09-15.355c-2.01-2.009-5.238-3.229-8.897-3.229c-3.946,0-6.889,1.004-9.615,4.305V15.14h-7.175v51.087     h7.318V47.787c2.655,3.156,5.669,4.162,9.543,4.162c3.66,0,6.816-1.221,8.826-3.23C251.64,45.061,252.07,38.818,252.07,33.293z      M244.751,33.293c0,6.457-0.933,12.127-7.533,12.127c-6.602,0-7.606-5.67-7.606-12.127c0-6.458,1.005-12.054,7.606-12.054     C243.818,21.239,244.751,26.835,244.751,33.293z"
+         id="path571" />
+      <path
+         i:knockout="Off"
+         style="fill:#2572fe;fill-opacity:1;"
+         d="M318.137,0.431h-8.18l-8.897,36.522L290.799,0.431h-6.242l-10.261,36.522     l-8.897-36.522h-8.18l13.346,51.087h6.745l10.332-35.804l10.404,35.804h6.744L318.137,0.431z"
+         id="path572" />
+      <path
+         i:knockout="Off"
+         style="fill-rule:evenodd;clip-rule:evenodd;fill:#2572fe;fill-opacity:1;"
+         d="M352.485,51.518V27.194     c0-8.251-5.022-12.485-14.996-12.485c-6.027,0-9.614,1.22-13.059,5.238l4.808,4.521c2.009-2.583,3.946-3.516,7.964-3.516     c5.668,0,7.965,2.225,7.965,6.816v2.583h-9.615c-8.323,0-12.557,4.377-12.557,10.475c0,3.086,1.005,5.885,2.87,7.822     c2.225,2.225,5.238,3.301,9.759,3.301s7.031-1.076,9.687-3.732v3.301H352.485z M345.167,38.387c0,2.584-0.503,4.307-1.579,5.383     c-1.938,1.865-4.018,2.08-6.816,2.08c-4.592,0-6.673-1.865-6.673-5.166s2.225-5.238,6.53-5.238h8.538V38.387z"
+         id="path573" />
+      <path
+         i:knockout="Off"
+         style="fill:#2572fe;fill-opacity:1;"
+         d="M386.687,18.153c-2.512-2.511-5.166-3.444-8.683-3.444     c-4.09,0-7.82,1.794-9.687,4.377V15.14h-7.175v36.378h7.319V29.418c0-5.022,3.3-8.18,7.246-8.18c2.512,0,3.804,0.79,5.453,2.439     L386.687,18.153z"
+         id="path574" />
+      <path
+         i:knockout="Off"
+         style="fill-rule:evenodd;clip-rule:evenodd;fill:#2572fe;fill-opacity:1;"
+         d="M420.467,35.445v-3.229     c0-10.333-5.668-17.507-15.427-17.507c-9.327,0-15.427,6.816-15.427,18.583c0,13.848,7.247,18.656,16.359,18.656     c6.387,0,9.902-1.938,13.633-5.67l-4.663-4.375c-2.583,2.582-4.736,3.73-8.826,3.73c-5.955,0-9.256-3.947-9.256-10.189H420.467z      M413.22,30.351H396.86c0.072-2.224,0.215-3.3,0.933-4.951c1.148-2.727,3.804-4.592,7.247-4.592c3.444,0,6.027,1.866,7.175,4.592     C412.933,27.051,413.148,28.127,413.22,30.351z"
+         id="path575" />
+      <path
+         i:knockout="Off"
+         style="fill:#2572fe;fill-opacity:1;"
+         d="M24.039,21.584h20.644c0.976,0,1.767,0.791,1.767,1.767v3.934     c0,0.976-0.791,1.766-1.767,1.766H24.039c-0.976,0-1.767-0.791-1.767-1.766v-3.934C22.272,22.375,23.063,21.584,24.039,21.584z"
+         id="path576" />
+      <path
+         i:knockout="Off"
+         style="fill-rule:evenodd;clip-rule:evenodd;fill:#2572fe;fill-opacity:1;"
+         d="M7.285,7.937V44.27h25.508h0.019h0.305     c0.355,0,1.555,0.416,1.558,1.311l0.009,0.656l-0.002,3.936c0.002,0.867-1.204,1.311-1.558,1.311l-2.175,0.004H3.069     C1.851,51.496,0,49.66,0,48.459V3.736C0,2.21,2.095,0.7,3.329,0.709h29.472h0.002h0.305c0.354,0,1.554,0.416,1.558,1.312     l-0.006,0.653v3.951c0.002,0.868-1.203,1.311-1.558,1.311h-0.305L7.285,7.937z"
+         id="path577" />
+    </g>
+  </g>
+</svg>
Index: /branches/2.0/phpgwapi/templates/classic/config.tpl
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/config.tpl	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/config.tpl	(revision 1196)
@@ -0,0 +1,104 @@
+<!-- BEGIN header -->
+<form method="POST" action="{action_url}">
+<table border="0" align="center" width="85%">
+   <tr bgcolor="{th_bg}">
+    <td colspan="2"><font color="{th_text}">&nbsp;<b>{title}</b></font></td>
+   </tr>
+<!-- END header -->
+<!-- BEGIN body -->
+   <tr bgcolor="{th_bg}">
+    <td colspan="2"><font color="{th_text}">&nbsp;<b>{lang_Path_information}</b></font></td>
+   </tr>
+   
+   </tr>
+   <tr bgcolor="{row_off}">
+    <td>{lang_Enter_the_full_path_for_temporary_files.<br>Examples:_/tmp,_C:\TEMP}:</td>
+    <td><input name="newsettings[temp_dir]" value="{value_temp_dir}" size="40"></td>
+   </tr>
+
+   <tr bgcolor="{row_off}">
+    <td>{lang_Enter_the_full_path_for_users_and_group_files.<br>Examples:_/files,_E:\FILES}:</td>
+    <td><input name="newsettings[files_dir]" value="{value_files_dir}" size="40"></td>
+   </tr>
+   
+   <tr bgcolor="{row_off}">
+    <td>{lang_Enter_the_location_of_eGroupWare's_URL.<br>Example:_http://www.domain.com/egroupware_&nbsp;_or_&nbsp;_/egroupware<br><b>No_trailing_slash</b>}:</td>
+    <td><input name="newsettings[webserver_url]" value="{value_webserver_url}" size="40"></td>
+   </tr>
+
+   <tr bgcolor="{row_on}">
+    <td colspan="2">&nbsp;</td>
+   </tr>
+
+   <tr bgcolor="{th_bg}">
+    <td colspan="2"><font color="{th_text}">&nbsp;<b>{lang_Host_information}</b></font></td>
+   </tr>
+
+   <tr bgcolor="{row_off}">
+    <td>{lang_Enter_the_hostname_of_the_machine_on_which_this_server_is_running}:</td>
+    <td><input name="newsettings[hostname]" value="{value_hostname}"></td>
+   </tr>
+
+   <tr bgcolor="{row_off}">
+    <td>{lang_Enter_your_default_FTP_server}:</td>
+    <td><input name="newsettings[default_ftp_server]" value="{value_default_ftp_server}"></td>
+   </tr>
+
+   <tr bgcolor="{row_off}">
+    <td>{lang_Attempt_to_use_correct_mimetype_for_FTP_instead_of_default_'application/octet-stream'}:</td>
+    <td>
+     <select name="newsettings[ftp_use_mime]">
+      <option value="">{lang_No}</option>
+      <option value="True"{selected_ftp_use_mime_True}>{lang_Yes}</option>
+     </select>
+    </td>
+   </tr>
+
+   <tr bgcolor="{row_off}">
+    <td>{lang_Datetime_port.<br>If_using_port_13,_please_set_firewall_rules_appropriately_before_submitting_this_page.<br>(Port:_13_/_Host:_129.6.15.28)}</td>
+    <td>
+      <select name="newsettings[daytime_port]">
+       <option value="00"{selected_daytime_port_00}>{lang_00_(disable)}</option>
+       <option value="13"{selected_daytime_port_13}>{lang_13_(ntp)}</option>
+       <option value="80"{selected_daytime_port_80}>{lang_80_(http)}</option>
+      </select>
+    </td>
+   </tr>
+
+   <tr bgcolor="{row_off}">
+    <td>{lang_Enter_your_HTTP_proxy_server}:</td>
+    <td><input name="newsettings[httpproxy_server]" value="{value_httpproxy_server}"></td>
+   </tr>
+
+   <tr bgcolor="{row_off}">
+    <td>{lang_Enter_your_HTTP_proxy_server_port}:</td>
+    <td><input name="newsettings[httpproxy_port]" value="{value_httpproxy_port}"></td>
+   </tr>
+
+   <tr bgcolor="{row_on}">
+    <td>{lang_Enter_the_site_username_for_peer_servers}.</td>
+    <td><input name="newsettings[site_username]" value="{value_site_username}"></td>
+   </tr>
+
+   <tr bgcolor="{row_off}">
+    <td>{lang_Enter_the_site_password_for_peer_servers}.</td>
+    <td><input type="password" name="newsettings[site_password]" value="{value_site_password}"></td>
+   </tr>
+
+<!-- END body -->
+
+<!-- BEGIN footer -->
+  <tr bgcolor="{th_bg}">
+    <td colspan="2">
+&nbsp;
+    </td>
+  </tr>
+  <tr>
+    <td colspan="2" align="center">
+      <input type="submit" name="submit" value="Submit">
+      <input type="submit" name="cancel" value="Cancel">
+    </td>
+  </tr>
+</table>
+</form>
+<!-- END footer -->
Index: /branches/2.0/phpgwapi/templates/classic/frames_navbar.tpl
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/frames_navbar.tpl	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/frames_navbar.tpl	(revision 1196)
@@ -0,0 +1,3 @@
+<!-- BEGIN frame_navbar -->
+  <frame src="{navbar_link}" name="phpgw_navbar" scrolling="no">
+<!-- END frame_navbar -->
Index: /branches/2.0/phpgwapi/templates/classic/doc/TODO
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/doc/TODO	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/doc/TODO	(revision 1196)
@@ -0,0 +1,5 @@
+- validate css and make valid CSS
+- validate html and make valid html 4.01
+- remove phpBB.org code etc...
+- a lot of icons
+- some sort of template-set configuration (maybe create a fake app???)
Index: /branches/2.0/phpgwapi/templates/classic/doc/CHANGELOG
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/doc/CHANGELOG	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/doc/CHANGELOG	(revision 1196)
@@ -0,0 +1,16 @@
+Fri Apr 18 01:51:00 CEST 2003
+- resize icons to 32x32
+- renamed css file for better compatibility
+- removed unneccesary files in calender and email template directory
+- merged changed from Ralf Becker
+- remade the logo
+- changed gif to png where possible (create_tabs in class.common.inc.php only uses gifs!!!)
+- moved tree to 0.9.16 branch
+
+Wed Apr 16 23:07:54 CEST 2003
+- Get app titles from new array without using the lang() call
+- Moved 'Homelink' from navbar to sidebox
+- Use preference setting 'icons', 'icons and text'
+- sidebox menu's can be hooked now (see template hook-files in phpgwapi/templates/idots/doc/hook_templates/
+- replaces correct gimpsource file for navbar icons: phpgwapi/templates/idots/source/navbar.xcf
+- additional information in the README
Index: /branches/2.0/phpgwapi/templates/classic/doc/README
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/doc/README	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/doc/README	(revision 1196)
@@ -0,0 +1,41 @@
++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+   IDOTS TEMPLATE SET FOR PHPGROUPWARE
+
++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+The template set idots, formaly known as MYiDOTS is 
+havely based on the Crystal Icon theme from 
+Everaldo. 
+
+   APPLICATION ICONS 
+===================================================
+Because of a bug in Internet Explorer which causes 
+it to display transpancy in PNG's as black I gave 
+all icons a background.
+
+Everybody is encouraged to make more icons for the 
+idots template set. Please don't use gif as Image
+type because this filetype in not an open standard
+
+The source Gimp-files can be found in 
+phpgwapi/templates/idots/source/
+
+The logo source file can also be found in the above
+directory.
+
+   APPLICATION HOOKS
+===================================================
+In the hook_file, hook_sidebox_menu.inc.php, 
+developers can define the sidebox menu's for their 
+applications template hook files can be found in 
+phpgwapi/templates/idots/hook_templates/
+
+
+Hope you enjoy this template set,
+Pim Snel
+
+
+
+
+
Index: /branches/2.0/phpgwapi/templates/classic/login.tpl
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/login.tpl	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/login.tpl	(revision 1196)
@@ -0,0 +1,125 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<HTML>
+<!-- BEGIN login_form -->
+<HEAD>
+<META http-equiv="Content-Type" content="text/html; charset={charset}">
+<META name="AUTHOR" content="dGroupWare http://www.eGroupWare.org">
+<META NAME="description" CONTENT="{website_title} login screen, working environment powered by eGroupWare">
+<META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW">
+<META NAME="keywords" CONTENT="{website_title} login screen, eGroupWare, groupware, groupware suite">
+<link href="phpgwapi/templates/celepar/login.css" rel="stylesheet" type="text/css">
+<TITLE>{website_title} - {lang_login}</TITLE>
+<script language="Javascript">
+<!--
+
+	function setLogin(){
+		if( document.form_login.organization != null)
+			document.form_login.login.value = document.form_login.organization.value+'-'+document.form_login.user.value;
+		else
+			document.form_login.login.value = document.form_login.user.value;			
+	}
+	
+	function getLogin(){
+		var cookie = '{cookie}';
+		if( document.form_login.organization != null)
+			document.form_login.user.value= cookie.substring(cookie.indexOf('-')+1,cookie.length);
+		else	
+			document.form_login.user.value= cookie;
+
+		if(document.form_login.user.value == '') {
+			if(document.form_login.organization != null)
+				document.form_login.organization.focus();
+			else
+				document.form_login.user.focus();
+		}
+		else
+			document.form_login.passwd.focus();
+	}
+	
+ 	function openWindow(newWidth,newHeight,link) {					
+		newScreenX  = screen.width - newWidth;	
+		newScreenY  = 0;		
+		Window1=window.open(link,'',"width="+newWidth+",height="+newHeight+",screenX="+newScreenX+",left="+newScreenX+",screenY="+newScreenY+",top="+newScreenY+",toolbar=no,scrollbars=yes,resizable=no");				
+	}	
+	-->
+</script>
+</HEAD>
+<body scroll="no"  style="overflow:hidden" onLoad="javascript:getLogin()" bgcolor="#ffffff">
+<table border="0" height="100%" width="100%">
+<tr><td align="center" valign="center">
+<table align="center" border="1" bordercolor="#cfcfcf" cellpadding="0" cellspacing="0" width="100%"  height="100%">
+<tbody><tr>
+    <td  height="100%">
+<table cellpadding="0" cellspacing="0" width="100%"  height="100%">
+	<tbody><tr>			
+    <td bgcolor="#e8eef7"  height="100%">
+    <table cellpadding="0" height="100%" cellspacing="0" width="100%" border="0"><tr><td width="60%">&nbsp;</td><td>
+	<div align="center" class="msgInicial">{cd}<br>{lang_message}<br>{website_title}{frontend_name}<br><br></div>
+        <table border="0" bordercolor="#cfcfcf" cellpadding="0" cellspacing="0" width="300">
+          <tbody><tr>
+				<FORM name="form_login" method="post" action="{login_url}" {autocomplete}>
+				<input type="hidden" name="passwd_type" value="text">
+				<input type="hidden" name="account type" value="u">
+				<input type="hidden" name="login">
+				<tr><td width="60%">&nbsp;</td><td>				          
+            	<td bgcolor="#f7f7f7" style="border:1px solid black">
+					<table border="0" cellpadding="0" cellspacing="0" class="tableLogin">
+						<tr><td width="96" colspan="3">&nbsp;</td></tr>	
+						<!-- BEGIN language_select -->
+						<tr>
+							<td width="96" class="loginLabel" align="right">{lang_language}:&nbsp;</td>
+							<td width="96">{select_language}</td>
+						</tr>
+						<!-- END language_select -->
+						{select_organization}
+					    <tr><td width="96" class="loginLabel" align="right">{lang_username}:&nbsp;</td>
+						<td width="96"><input name="user" size="15"></td>
+						<td width="43" rowspan="3" colspan=2><img src="phpgwapi/templates/celepar/images/icon_login.gif" width="43" height="64"></td>
+					  </tr>
+					  <tr>
+						<td width="96" class="loginLabel"  align="right">{lang_password}:&nbsp;</td>
+						<td width="135"><input name="passwd" type="password" size="15"></td>
+
+					  </tr>
+					  <tr>
+						<td width="66">&nbsp;</td>
+						<td width="135">
+						  <input type="submit" value="{lang_login}" name="submitit" class=button onClick="javascript:setLogin()">
+						</td>
+						</tr>
+					  <tr>	
+				  		<td width="66">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+				  			<!--a href="#" title="Clique aqui para ajuda" alt="Clique aqui para ajuda" onmouseover="javascript:self.status='Ajuda do Expresso Livre'" onmouseout="javascript:self.status=''" onclick="javascript:openWindow(480,510,'help')">
+				  				<font size="-1"> Ajuda</font></a--></td>
+						<td width="135">&nbsp;</td>
+						<td>&nbsp;</td>		
+				  	   </tr>		
+					</table>              
+              </td>
+              </form>
+          </tr>
+        </tbody></table>      
+      </td</tr></table>
+      </div>
+      </td>		
+    <td valign="bottom" bgcolor="#e8eef7"><div align="left"><img src="phpgwapi/templates/celepar/images/logo_expresso_1.gif" alt=""></div></td>
+	</tr>
+	<tr>		
+    <td background="phpgwapi/templates/celepar/images/logo_expresso_4.gif"><div align="right"><img src="phpgwapi/templates/celepar/images/logo_expresso_3.gif" alt="" height="46" width="485"></div></td>		
+    <td background="phpgwapi/templates/celepar/images/logo_expresso_5.gif"><div align="left"><img src="phpgwapi/templates/celepar/images/logo_expresso_2.gif" alt="" height="46" width="285"></div></td>
+	</tr>	
+	<tr>	
+    <td bgcolor="#f7f7f7" valign="top"><div align="right">
+        <table border="0" cellpadding="0" cellspacing="0" width="300px">
+          <tbody><tr> 
+            <td><a title="Governo do Paran&aacute;" href="http://www.pr.gov.br" target="_blank"><img border=0 src="phpgwapi/templates/celepar/images/logo_governo.gif"/></a></td>
+            <td><div align="center"><a title="Celepar Inform&aacute;tica do Paran&aacute;" target="_blank" href="http://www.celepar.pr.gov.br/"><img border=0 src="phpgwapi/templates/celepar/images/logo_celepar.gif"></a><a title="eGroupWare" style="text-decoration:none" target="_blank" href="http://www.egroupware.org/"><font color="#9a9a9a" face="Verdana, Arial, Helvetica, sans-serif" size="1"><br>Powered by eGroupWare {version}</a></font></div></td>
+          </tr>
+        </tbody></table><br>
+      </div></td>
+	 <td bgcolor="#f7f7f7" height="100%"></td>
+	</tr>	
+</tbody></table>
+</td></tr></tbody></table>
+</td></tr></table>
+</body></html>
Index: /branches/2.0/phpgwapi/templates/classic/navbar.inc.php
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/navbar.inc.php	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/navbar.inc.php	(revision 1196)
@@ -0,0 +1,451 @@
+<?php
+	/**************************************************************************\
+	* phpGroupWare                                                             *
+	* http://www.phpgroupware.org                                              *
+	* --------------------------------------------                             *
+	*  This program is free software; you can redistribute it and/or modify it *
+	*  under the terms of the GNU General Public License as published by the   *
+	*  Free Software Foundation; either version 2 of the License, or (at your  *
+	*  option) any later version.                                              *
+	\**************************************************************************/
+
+
+	function parse_navbar($force = False)
+	{
+		$GLOBALS['celepar_tpl'] = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
+
+		$GLOBALS['celepar_tpl']->set_file(
+			array(
+				'navbar' => 'navbar.tpl'
+			)
+		);
+
+		$GLOBALS['celepar_tpl']->set_block('navbar','navbar_header','navbar_header');
+		$GLOBALS['celepar_tpl']->set_block('navbar','extra_blocks_header','extra_block_header');
+		$GLOBALS['celepar_tpl']->set_block('navbar','extra_block_row','extra_block_row');
+		$GLOBALS['celepar_tpl']->set_block('navbar','extra_block_spacer','extra_block_spacer');
+		$GLOBALS['celepar_tpl']->set_block('navbar','extra_blocks_footer','extra_blocks_footer');
+		$GLOBALS['celepar_tpl']->set_block('navbar','sidebox_hide_header','sidebox_hide_header');
+		$GLOBALS['celepar_tpl']->set_block('navbar','sidebox_hide_footer','sidebox_hide_footer');
+		$GLOBALS['celepar_tpl']->set_block('navbar','appbox','appbox');
+		$GLOBALS['celepar_tpl']->set_block('navbar','navbar_footer','navbar_footer');
+		
+	        $GLOBALS['celepar_tpl']->set_var('my_preferences', lang("My Preferences"));
+                $GLOBALS['celepar_tpl']->set_var('title_my_preferences', lang("Click here to change your Expresso password and other preferences"));
+                $GLOBALS['celepar_tpl']->set_var('title_suggestions', lang("Send your critics, doubts or suggestions"));
+                $GLOBALS['celepar_tpl']->set_var('suggestions', lang("Suggestions"));
+                $GLOBALS['celepar_tpl']->set_var('help', lang("Help"));
+                $GLOBALS['celepar_tpl']->set_var('title_help', lang("Click here for help"));
+
+		$var['img_root'] = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/celepar/images';
+		$var['dir_root'] = $GLOBALS['phpgw_info']['server']['webserver_url'];
+		$var['table_bg_color'] = $GLOBALS['phpgw_info']['theme']['navbar_bg'];
+
+		if($GLOBALS['phpgw_info']['user']['preferences']['common']['click_or_onmouseover']=='onmouseover')
+		{
+			$show_menu_event = 'onMouseOver';
+		}
+		else
+		{
+			$show_menu_event = 'onClick';
+		}
+
+
+		$applications = '';
+
+		//	== 'icons_and_text')
+
+		$max_icons=$GLOBALS['phpgw_info']['user']['preferences']['common']['max_icons'];
+		 
+		if(!$max_icons)
+		{
+			$max_icons=200;
+		}
+		
+		$i = 0;
+		foreach($GLOBALS['phpgw_info']['navbar'] as $app => $app_data)
+		{
+			
+				if($app != 'preferences' && $app != 'about' && $app != 'logout')
+				{
+					$title = $GLOBALS['phpgw_info']['apps'][$app]['title'];
+					$icon = '<a href="'.$app_data['url'].'"><img src="' . $app_data['icon'] . '" alt="' . $title . '" title="'. $title . '" border="0" /></a>';
+	
+					// 020204 ndee
+					if($app == 'home') $title = lang('Home');
+	
+					if($app=='home')
+					{
+						if($GLOBALS['phpgw_info']['user']['preferences']['common']['start_and_logout_icons']=='no')
+						{
+							continue;
+						}
+					}
+				
+					// Verifica qual o formato da Barra de navegação: 
+					// Icone ou Texto, ou Icone e Texto
+					
+
+					if($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format']=='icons') {
+						$title_extra = $title;
+						$title = '';
+					}
+					else if($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format']=='text'){
+						$icon = '';
+					}
+
+					if($i< $max_icons) {
+
+						if($GLOBALS['phpgw_info']['user']['preferences']['common']['start_and_logout_icons']=='no')
+						{
+							$tdwidth = 100/($max_icons);
+						}
+						else
+						{
+							$tdwidth = 100/($max_icons+2);
+						}
+						
+						$app_icons .= '<td nowrap width="74px" height="40" valign="center" align="center" style="padding-bottom:10px;cursor:pointer;cursor:hand;background-repeat:no-repeat;background-image:url('.$var['img_root'].'/back_app.png)">';
+	
+						if(isset($GLOBALS['phpgw_info']['flags']['navbar_target']) && $GLOBALS['phpgw_info']['flags']['navbar_target'])
+						{
+							$app_icons .= ' target="' . $GLOBALS['phpgw_info']['flags']['navbar_target'] . '"';
+						}						
+						$app_icons .=  $icon;
+					}
+					
+										
+					$icon = '<img align="center" src="' . $app_data['icon'] . '" alt="' . $title . '" width="16" title="'. $title . '" border="0" />';
+				
+					$app_extra_icons .= '<tr>';
+
+					if($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format']!='text')
+					{
+						$app_extra_icons .= '<td class="extraIconsRow"><a href="' . $app_data['url'] . '"';
+
+						if(isset($GLOBALS['phpgw_info']['flags']['navbar_target']) && $GLOBALS['phpgw_info']['flags']['navbar_target'])
+						{
+							$app_extra_icons .= ' target="' . $GLOBALS['phpgw_info']['flags']['navbar_target'] . '"';
+						}
+
+						$app_extra_icons .= ' >' . $icon . '</a></td>';
+					}
+
+
+						$app_extra_icons .= '<td align="left" class="extraIconsRow" style=""><a href="'.$app_data['url'] . '"';
+
+						if(isset($GLOBALS['phpgw_info']['flags']['navbar_target']) && $GLOBALS['phpgw_info']['flags']['navbar_target'])
+						{
+							$app_extra_icons .= ' target="' . $GLOBALS['phpgw_info']['flags']['navbar_target'] . '"';
+						}
+
+						$app_extra_icons .= '>' . $title_extra . '</a></td></tr>';
+
+					unset($icon);
+					unset($title);
+					$i++;				
+				}
+			}
+			
+			if($GLOBALS['phpgw_info']['user']['preferences']['common']['start_and_logout_icons']!='no')	
+			{
+			
+				$hint = $GLOBALS['phpgw_info']['navbar']['logout']['title'];
+				$icon = '<img src="'.$GLOBALS['phpgw_info']['navbar']['logout']['icon'].'"  alt="'.$hint.'" title="'.$hint.'">';
+				
+				if($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format']=='icons') {
+					
+						$title = '';
+				}
+				else if($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format']=='text'){
+					
+						$icon = '';
+				}			
+			
+				$app_icons .= '<td width="74px" height="40" valign="center" align="center" onclick="location.href=\''.$GLOBALS['phpgw_info']['navbar']['logout']['url'].'\'" style="cursor:pointer;cursor:hand;background-repeat:no-repeat;padding-bottom:20px;background-image:url('.$var['img_root'].'/back_app.png)">'.$icon.'</td>';
+			}			//			window.location.href=\''.$GLOBALS['phpgw_info']['navbar']['logout']['url'].'\'
+			
+			$var['app_icons'] = $app_icons;
+			
+			$hint = $GLOBALS['phpgw_info']['navbar']['logout']['title'];
+			$icon = '<img width="16" src="'.$GLOBALS['phpgw_info']['navbar']['logout']['icon'].'"  alt="'.$hint.'" title="'.$hint.'">';
+			$title = $GLOBALS['phpgw_info']['navbar']['logout']['title'];
+			
+			$app_extra_icons .= '<td  class="extraIconsRow">
+				<a href="'.$GLOBALS['phpgw_info']['navbar']['logout']['url'].'">'.$icon.'</a></td>';
+
+			$app_extra_icons .= '<td class="extraIconsRow">
+				<a href="'.$GLOBALS['phpgw_info']['navbar']['logout']['url'].'">'.$title.'</a></td>';
+
+				
+				$app_extra_icons_div = '
+				<script language="javascript">
+				new ypSlideOutMenu("menu1", "down", 5, 24, 160, 200,\'left\')
+				</script>
+				<div id="menu1Container">
+				<div id="menu1Content" style="position: relative; left: 0; text-align: left;">
+
+				<div id="extraIcons">
+
+				<table cellspacing="0" cellpadding="0" border="0" width="100%">
+				<tr>
+				<td colspan="2" nowrap="nowrap" align="right" style="background-color:#dddddd;padding:1px;">
+				<a href="#" '.$show_menu_event.'="ypSlideOutMenu.hide(\'menu1\')" title="'.lang('close').'">
+				<img style="" border="0" src="'.$var['img_root'].'/close.png"/></a></span></td></tr>
+				<tr>
+				<td colspan="1" valign="top" nowrap="nowrap" align="left" style="background-color:#dddddd;padding:1px;">
+					<a href="#" onClick="javascript:ypSlideOutMenu.hide(\'menu1\');showBar()" title="'.lang('Expand Menu').'">
+					<img src = "'.$var['img_root'].'/down.button.png"></a>
+				</td>
+				<td colspan="1" valign="top" nowrap="nowrap" align="left" style="background-color:#dddddd;padding:1px;">
+					<a href="#" onClick="javascript:ypSlideOutMenu.hide(\'menu1\');showBar()" title="'.lang('Expand Menu').'">
+					<b>'.lang('Expand Menu').'</b></a></td></tr>				
+				'.$app_extra_icons.'</table>
+				</div>
+
+				</div>
+				</div>
+				';
+
+				$var['app_extra_icons_div']= $app_extra_icons_div;				
+				$var['app_extra_icons_icon']= '<td width="26" valign="top" align="right" style="zIndex:10000;padding-right:3px;padding-top:10px;"><a title="'.lang('show_more_apps').'" href="#"  '.$show_menu_event.'="ypSlideOutMenu.showMenu(\'menu1\')"><img src="'.$var['img_root'].'/extra_icons.png" border="0" /></a></td>';
+
+
+			if(isset($GLOBALS['phpgw_info']['flags']['app_header']))
+			{
+				$var['current_app_title'] = $GLOBALS['phpgw_info']['flags']['app_header'];
+			}
+			else
+			{
+				$var['current_app_title']=$GLOBALS['phpgw_info']['navbar'][$GLOBALS['phpgw_info']['flags']['currentapp']]['title'];
+			}
+
+			if(isset($GLOBALS['phpgw_info']['navbar']['admin']) && $GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
+			{
+				$var['current_users'] = '<a href="'
+				. $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions') . '">'
+				. lang('Current users') . ': ' . $GLOBALS['phpgw']->session->total() . '</a>';
+			}
+			$now = time();			
+			$var['user_info'] = '<b>'.$GLOBALS['phpgw']->common->display_fullname() .'</b>'. ' - '
+			. lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
+			. $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+			
+			if($GLOBALS['phpgw_info']['server']['use_frontend_name'])
+				$var['frontend_name'] = " - ".$GLOBALS['phpgw_info']['server']['use_frontend_name'];
+
+			/*
+			 *	Forçar termo de aceite por parte do usuário
+			 */
+
+			if(($GLOBALS['phpgw_info']['user']['agree_terms'] != 1) && ($GLOBALS['phpgw_info']['server']['use_agree_term']=='True')) //Ele deverá confirmar o termo de aceite.
+			{
+				$agreeterm_url = $_SERVER['HTTP_HOST'] . $GLOBALS['phpgw_info']['server']['webserver_url'] . '/preferences/termo_aceite.php';
+				
+				if ($GLOBALS['phpgw_info']['server']['use_https'] == 2)
+					$agreeterm_url = 'https://' . $agreeterm_url;
+				else
+					$agreeterm_url = 'http://' . $agreeterm_url;
+				
+				echo '<script>' .
+						'if(location.href.indexOf("termo_aceite.php") == -1){' .
+							'location.href = "' . $agreeterm_url . '"' .
+						'}' .
+					 '</script>';
+			}
+			
+
+			if(($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == '0') && (($GLOBALS['phpgw_info']['user']['agree_terms'] == 1) || ($GLOBALS['phpgw_info']['server']['use_agree_term']!='True')))
+			{
+				$changepasswd_url = $_SERVER['HTTP_HOST'] . $GLOBALS['phpgw_info']['server']['webserver_url'] . '/preferences/changepassword.php?cd=1';
+				
+				if ($GLOBALS['phpgw_info']['server']['use_https'] > 0)
+					$changepasswd_url = 'https://' . $changepasswd_url;
+				else
+					$changepasswd_url = 'http://' . $changepasswd_url;
+				
+				echo '<script>' .
+						'if(location.href.indexOf("changepassword.php") == -1){' .
+							'location.href = "' . $changepasswd_url . '"' .
+						'}' .
+					 '</script>';
+				
+				/*
+				$api_messages = lang('You are required to change your password during your first login')
+				. '<br> Click this image on the navbar: <img src="'
+				. $GLOBALS['phpgw']->common->image('preferences','navbar.gif').'">';
+				*/
+			}
+			/*
+			elseif($GLOBALS['phpgw_info']['user']['lastpasswd_change'] < time() - (86400*30))
+			{
+				$api_messages = lang('it has been more then %1 days since you changed your password',30);
+			}
+			*/
+			/*
+			// This is gonna change
+			if(isset($cd))
+			{
+				$var['messages'] = $api_messages . '<br>' . checkcode($cd);
+			}*/
+
+			$var['logo_file'] = $GLOBALS['phpgw']->common->image('phpgwapi',$GLOBALS['phpgw_info']['server']['login_logo_file']?$GLOBALS['phpgw_info']['server']['login_logo_file']:'logo');
+			$var['logo_url'] = $GLOBALS['phpgw_info']['server']['login_logo_url']?$GLOBALS['phpgw_info']['server']['login_logo_url']:'http://www.eGroupWare.org';
+			$var['logo_title'] = $GLOBALS['phpgw_info']['server']['login_logo_title']?$GLOBALS['phpgw_info']['server']['login_logo_title']:'www.eGroupWare.org';
+			$var['hide_bar_txt'] = lang("Hide header and toolbar");
+			$var['show_bar_txt'] = lang("Show header and toolbar");
+			$GLOBALS['celepar_tpl']->set_var($var);
+			$GLOBALS['celepar_tpl']->pfp('out','navbar_header');
+
+			/******************************************************\
+			* The sidebox menu's                                   *
+			\******************************************************/
+
+			$menu_title = lang('General Menu');
+
+			$file['Home'] = $GLOBALS['phpgw_info']['navbar']['home']['url'];
+			if($GLOBALS['phpgw_info']['user']['apps']['preferences'])
+			{
+				$file['Preferences'] = $GLOBALS['phpgw_info']['navbar']['preferences']['url'];
+			}
+			$file += array(
+				array(
+					'text'    => lang('About %1',$GLOBALS['phpgw_info']['apps'][$GLOBALS['phpgw_info']['flags']['currentapp']]['title']),
+					'no_lang' => True,
+					'link'    => $GLOBALS['phpgw_info']['navbar']['about']['url']
+				),
+				'Logout'=>$GLOBALS['phpgw_info']['navbar']['logout']['url']
+			);
+
+			if($GLOBALS['phpgw_info']['user']['preferences']['common']['auto_hide_sidebox']==1)
+			{
+				$GLOBALS['celepar_tpl']->set_var('show_menu_event',$show_menu_event);
+				$GLOBALS['celepar_tpl']->set_var('lang_show_menu',lang('show menu'));
+				$GLOBALS['celepar_tpl']->pparse('out','sidebox_hide_header');
+
+				display_sidebox('',$menu_title,$file);
+				$GLOBALS['phpgw']->hooks->single('sidebox_menu',$GLOBALS['phpgw_info']['flags']['currentapp']);
+
+				$GLOBALS['celepar_tpl']->pparse('out','sidebox_hide_footer');
+
+				$var['sideboxcolstart']='';
+
+				$GLOBALS['celepar_tpl']->set_var($var);
+				$GLOBALS['celepar_tpl']->pparse('out','appbox');
+				$var['remove_padding'] = 'style="padding-left:0px;"';
+				$var['sideboxcolend'] = '';
+			}
+			else
+			{
+				$var['menu_link'] = '';
+				$var['sideboxcolstart'] = '<td id="tdSidebox" valign="top">';
+				$var['remove_padding'] = '';
+				$GLOBALS['celepar_tpl']->set_var($var);
+				$GLOBALS['celepar_tpl']->pparse('out','appbox');
+
+				display_sidebox('',$menu_title,$file);
+				$GLOBALS['phpgw']->hooks->single('sidebox_menu',$GLOBALS['phpgw_info']['flags']['currentapp']);
+
+				$var['sideboxcolend'] = '</td>';
+			}
+
+			$GLOBALS['celepar_tpl']->set_var($var);
+			$GLOBALS['celepar_tpl']->pparse('out','navbar_footer');
+
+			// If the application has a header include, we now include it
+			if(!@$GLOBALS['phpgw_info']['flags']['noappheader'] && @isset($_GET['menuaction']))
+			{
+				list($app,$class,$method) = explode('.',$_GET['menuaction']);
+				if(is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions['header'])
+				{
+					$GLOBALS[$class]->header();
+				}
+			}
+			$GLOBALS['phpgw']->hooks->process('after_navbar');
+			return;
+		}
+
+		function display_sidebox($appname,$menu_title,$file)
+		{
+			if(!$appname || ($appname==$GLOBALS['phpgw_info']['flags']['currentapp'] && $file))
+			{
+				$var['lang_title']=$menu_title;//$appname.' '.lang('Menu');
+				$GLOBALS['celepar_tpl']->set_var($var);
+				$GLOBALS['celepar_tpl']->pfp('out','extra_blocks_header');
+
+				foreach($file as $text => $url)
+				{
+					sidebox_menu_item($url,$text);
+				}
+
+				$GLOBALS['celepar_tpl']->pparse('out','extra_blocks_footer');
+			}
+		}
+
+		function sidebox_menu_item($item_link='',$item_text='')
+		{
+			if($item_text === '_NewLine_' || $item_link === '_NewLine_')
+			{
+				$GLOBALS['celepar_tpl']->pparse('out','extra_block_spacer');
+			}
+			else
+			{
+				$var['icon_or_star']='<img src="'.$GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/celepar/images'.'/orange-ball.png" width="9" height="9" alt="ball"/>';
+				$var['target'] = '';
+				if(is_array($item_link))
+				{
+					if(isset($item_link['icon']))
+					{
+						$app = isset($item_link['app']) ? $item_link['app'] : $GLOBALS['phpgw_info']['flags']['currentapp'];
+						$var['icon_or_star'] = '<img src="'.$GLOBALS['phpgw']->common->image($app,$item_link['icon']).'"/>';
+					}
+					$var['lang_item'] = isset($item_link['no_lang']) && $item_link['no_lang'] ? $item_link['text'] : lang($item_link['text']);
+					$var['item_link'] = $item_link['link'];
+					if ($item_link['target'])
+					{
+						$var['target'] = ' target="' . $item_link['target'] . '"';
+					}
+				}
+				else
+				{
+					$var['lang_item'] = lang($item_text);
+					$var['item_link'] = $item_link;
+				}
+				$GLOBALS['celepar_tpl']->set_var($var);
+				$GLOBALS['celepar_tpl']->pparse('out','extra_block_row');
+			}
+		}
+
+		function parse_navbar_end()
+		{
+			$GLOBALS['celepar_tpl'] = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
+
+			$GLOBALS['celepar_tpl']->set_file(
+				array(
+					'footer' => 'footer.tpl'
+				)
+			);
+			
+			$var = Array(
+				'img_root'       => $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/celepar/images',
+				'table_bg_color' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
+				'version'        => $GLOBALS['phpgw_info']['server']['versions']['phpgwapi']
+			);
+			$GLOBALS['phpgw']->hooks->process('navbar_end');
+			
+
+			if($GLOBALS['phpgw_info']['user']['preferences']['common']['show_generation_time'])
+			{
+				$mtime = microtime(); 
+				$mtime = explode(' ',$mtime); 
+				$mtime = $mtime[1] + $mtime[0]; 
+				$tend = $mtime; 
+				$totaltime = ($tend - $GLOBALS['page_start_time']); 
+
+				$var['page_generation_time'] = '<div id="divGenTime"><br/><span>'.lang('Page was generated in %1 seconds',$totaltime).'</span></div>';
+			}
+
+			$var['powered_by'] = lang('Powered by phpGroupWare version %1',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
+			$GLOBALS['celepar_tpl']->set_var($var);
+			$GLOBALS['celepar_tpl']->pfp('out','footer');
+		}
Index: /branches/2.0/phpgwapi/templates/classic/navbar.tpl
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/navbar.tpl	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/navbar.tpl	(revision 1196)
@@ -0,0 +1,162 @@
+<!-- BEGIN navbar_header -->
+<div align="center" id="hiddenButton" style="position:absolute">
+</div>
+<div align="center" id="extraButton" style="position:absolute">
+<table><tr>{app_extra_icons_icon}</tr></table>
+</div>
+{app_extra_icons_div}
+<script language="Javascript">	 
+	function showBar(){
+		bar = document.getElementById("toolbar");	
+		bar.style.visibility = "";
+		bar.style.position ="static";
+		but = document.getElementById("hiddenButton");		
+		but.style.visibility = "";
+		but.style.position = "absolute";		
+		but.style.top = "55px";		
+		but.style.left = "2px";		
+		title = "{hide_bar_txt}";
+		extra = document.getElementById("extraButton");
+		extra.style.visibility = "hidden";		
+		but.innerHTML="<a title='"+title+"' onClick='javascript:changeBar()'><img src='{img_root}/up.button.png'></a>";
+		var neverExpires = new Date("January 01, 2100 00:00:00");
+ 		document.cookie = "showHeader=true"+
+ 						  ";expires=" + neverExpires.toGMTString()+
+ 						  ";path=/";
+	}
+
+	function hideBar(){
+		bar = document.getElementById("toolbar");	
+		bar.style.position ="absolute";
+		bar.style.visibility = "hidden";
+		but = document.getElementById("hiddenButton");		
+		but.style.visibility = "hidden";
+		title = "{show_bar_txt}";
+		extra = document.getElementById("extraButton");
+		extra.style.visibility = ""
+		extra.style.top = "-11px";		
+		extra.style.left = "-10px";		
+		var neverExpires = new Date("January 01, 2100 00:00:00");
+ 		document.cookie = "showHeader=false"+
+ 						  ";expires=" + neverExpires.toGMTString()+
+ 						  ";path=/";
+	}
+	function changeBar(){
+		bar = document.getElementById("toolbar");			
+		if(bar.style.visibility == "hidden")
+			showBar();		
+		else
+			hideBar();
+	}
+	function initBar(val){
+
+		if(val == 'true')
+			showBar();		
+		else
+			hideBar();		
+	}	
+</script>
+
+<div  id="toolbar" style="visibility:hidden;position:absolute">
+<table border="0" width="100%" cellpadding=0 cellspacing=0><tr>
+	<td background="{img_root}/fundo_topo.gif"></td>
+	<td align="center" background="{img_root}/fundo_topo.gif">
+	<table width="auto" border="0" cellpadding="0" cellspacing="0">{app_icons}</table>
+	</td><td style="padding-left:0px;padding-right:25px" align="right" background="{img_root}/fundo_topo.gif" nowrap>
+<a name="0"><img src="{img_root}/logo_expresso.png?1"></a></td></tr></table>
+
+</div>
+<div id ="divStatusBar">
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
+ <tr>
+  <td width="30%" align="left" id="user_info" nowrap>{user_info}{frontend_name}</td>
+  <td width="30%" id="admin_info" nowrap>{current_users}</td>
+  <td style="padding-right:10px" width="*" align="right" valign="center" nowrap="true">
+  		<a href="{dir_root}/preferences" title="{title_my_preferences}" alt="{title_my_preferences}" onmouseover="javascript:self.status='{title_my_preferences}'" onmouseout="javascript:self.status=''"><img height="15px" src="{dir_root}/phpgwapi/templates/celepar/images/preferences.png"><font size="-1">{my_preferences}</font></a>
+  		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 
+  		<a href="#" title="{title_suggestions}" alt="{title_suggestions}" onmouseover="javascript:self.status='{title_suggestions}'" onmouseout="javascript:self.status=''" onclick="javascript:openWindow(400,550,'{dir_root}/help/enviasugestao.php')"><img src="{dir_root}/phpgwapi/templates/celepar/images/criticas.jpg"><font size="-1">{suggestions}</font></a>
+  		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+  		<a href="#" title="{title_help}" alt="{title_help}" onmouseover="javascript:self.status='{title_help}'" onmouseout="javascript:self.status=''" onclick="javascript:openWindow(480,510,'{dir_root}/help')"><img src="{dir_root}/phpgwapi/templates/celepar/images/ajuda.jpg"><font size="-1">{help}</font></a>
+  </td>
+ </tr>
+</table>
+</div>
+<script language="Javascript">
+ function openWindow(newWidth,newHeight,link)
+  {			
+		
+	newScreenX  = screen.width - newWidth;	
+	newScreenY  = 0;		
+	Window1=window.open(link,'',"width="+newWidth+",height="+newHeight+",screenX="+newScreenX+",left="+newScreenX+",screenY="+newScreenY+",top="+newScreenY+",toolbar=no,scrollbars=yes,resizable=no");
+				
+  }	
+</script>
+<!-- END navbar_header -->
+<!-- BEGIN appbox -->	
+	<div id="divSubContainer">
+		<table width="100%" cellspacing="0" cellpadding="0" border="0">
+		<tr>
+		{sideboxcolstart}
+<!-- END appbox -->
+<!-- BEGIN sidebox_hide_header -->
+	<script language="javascript">
+		new ypSlideOutMenu("menu2", "right", 0, 165, 160, 200)
+	</script>
+
+	<div id="sideboxdragarea" style="position:absolute;left:0px;top:175px">
+	<a href="#" {show_menu_event}="ypSlideOutMenu.showMenu('menu2')" onmouseover="//ypSlideOutMenu.showMenu('menu2')" title="{lang_show_menu}"><img src="{img_root}/dragarea_right.png" /></a>
+	</div>
+	<div id="menu2Container">
+	<div id="menu2Content" style="position: relative; left: 0; text-align: left;">
+		<table cellspacing="0" cellpadding="0" border="0">
+		 <tr><td>
+		  
+		<div style="background-color:#ffffff;border: #9c9c9c 1px solid;padding:5px;">
+<!-- END sidebox_hide_header -->
+<!-- BEGIN sidebox_hide_footer -->
+</div>
+</td><td style="padding-top:10px" valign="top">
+<a href="#" onClick="ypSlideOutMenu.hide('menu2')" ><img src="{img_root}/dragarea_left.png" align="right" /></a>
+</td></tr></table>
+</div>
+</div>
+<script language="Javascript">
+	initBar(GetCookie("showHeader"));
+</script>
+<!-- END sidebox_hide_footer -->
+
+
+
+
+
+<!-- BEGIN navbar_footer -->	
+		{sideboxcolend}
+		<!-- End Sidebox Column -->
+		<!-- Applicationbox Column -->
+		<td id="tdAppbox" valign="top" {remove_padding}>
+		<div id="divAppboxHeader">{current_app_title}</div>
+		<div id="divAppbox">
+		<table id="tableDivAppbox" width="98%" cellpadding="0" cellspacing="0">
+		<tr><td>
+<!-- END navbar_footer -->
+<!-- BEGIN extra_blocks_header -->
+<div class="divSidebox">
+	<div class="divSideboxHeader"><span>{lang_title}</span></div>
+	<div>
+		<table width="100%" cellspacing="0" cellpadding="0" border=0>
+<!-- END extra_blocks_header -->
+<!-- BEGIN extra_blocks_footer -->
+	</table>	
+		</div>
+		</div>
+		<div class="sideboxSpace"></div>
+<!-- END extra_blocks_footer -->
+<!-- BEGIN extra_block_row -->
+<tr class="divSideboxEntry">
+<td width="15" align="center" valign="middle" class="textSidebox">{icon_or_star}</td><td class="textSidebox"><a class="textSidebox" href="{item_link}"{target}>{lang_item}</a></td></tr>
+<!-- END extra_block_row -->
+<!-- BEGIN extra_block_spacer -->
+<tr class="divSideboxEntry"> 
+	<td colspan="2" height="8" class="textSidebox">&nbsp;</td>
+</tr>
+<!-- END extra_block_spacer -->
Index: /branches/2.0/phpgwapi/templates/classic/navbar_app.tpl
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/navbar_app.tpl	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/navbar_app.tpl	(revision 1196)
@@ -0,0 +1,3 @@
+<!--	<TD width="10%" align=center><img src="{img_root}/admin.jpg" width="60" height="62"></TD>-->
+
+<!--<td align="center" width="{width}">{value}</td>-->
Index: /branches/2.0/phpgwapi/templates/classic/about.tpl
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/about.tpl	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/about.tpl	(revision 1196)
@@ -0,0 +1,33 @@
+<table border="0" width="100%" cellspacing="0" cellpadding="0">
+<!-- <tr>
+  <td align="left">
+   <a href="http://www.eGroupWare.org" target="_new"><img src="{phpgw_logo}" border="0" alt="eGroupWare"></a>
+  </td>
+ </tr>
+ <tr>
+  <td>&nbsp;</td>
+ </tr>
+ <tr>
+  <td align="left">{phpgw_version}</td>
+ </tr>
+ <tr>
+  <td align="left">{phpgw_message}</td>
+ </tr>
+ <tr>
+ <td  height="3"><img src="phpgwapi/templates/default/images/spacer.gif" alt="spacer" height="3" /></td>
+</tr>
+<tr>
+  <td align="center"><div class="greyLine"></div></td>
+ </tr>
+ -->
+ <tr>
+ <td  height="3"><img src="phpgwapi/templates/default/images/spacer.gif" alt="spacer" height="3" /></td>
+</tr>
+ <tr>
+  <td align="left">
+
+{phpgw_app_about}
+
+  </td>
+ </tr>
+</table>
Index: /branches/2.0/phpgwapi/templates/classic/frames.tpl
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/frames.tpl	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/frames.tpl	(revision 1196)
@@ -0,0 +1,7 @@
+<!-- BEGIN frames -->
+<html>
+ <frameset rows="{frame_size}" border="0">
+  {frames_}
+ </frameset>
+</html>
+<!-- END frames -->
Index: /branches/2.0/phpgwapi/templates/classic/js/cookieManager.js
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/js/cookieManager.js	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/js/cookieManager.js	(revision 1196)
@@ -0,0 +1,50 @@
+/*  Script contendo funcoes de manipulacao de cookies.
+	// baseado em script de Bill Dortch, hIdaho Design <bdortch@hidaho.com> e
+	// adaptado por Jorge Kinoshita.
+*/
+	function getCookieVal (offset) {
+	  var endstr = document.cookie.indexOf (";", offset);
+	  if (endstr == -1)
+	    endstr = document.cookie.length;
+	  return unescape(document.cookie.substring(offset, endstr));
+	}
+	
+	function FixCookieDate (date) {
+	  var base = new Date(0);
+	  var skew = base.getTime(); // dawn of (Unix) time - should be 0
+	  if (skew > 0)  // Except on the Mac - ahead of its time
+	    date.setTime (date.getTime() - skew);
+	}
+	//
+	//  Function to return the value of the cookie specified by "name".
+	//    name - String object containing the cookie name.
+	//    returns - String object containing the cookie value, or null if
+	//      the cookie does not exist.
+	
+	function GetCookie (name) {
+	  var arg = name + "=";
+	  var alen = arg.length;
+	  var clen = document.cookie.length;
+	  var i = 0;
+	  while (i < clen) {
+	    var j = i + alen;
+	    if (document.cookie.substring(i, j) == arg)
+	      return getCookieVal (j);
+	    i = document.cookie.indexOf(" ", i) + 1;
+	    if (i == 0) break; 
+	  }
+
+	  return 'true';
+	}
+		
+	function SetCookie (name,value,expires,path,domain,secure) {
+	  document.cookie = name + "=" + escape (value) +
+    	((expires) ? "; expires=" + expdate.toGMTString() : "") +
+	    ((path) ? "; path=" + path : "") +
+    	((domain) ? "; domain=" + domain : "") +
+	    ((secure) ? "; secure" : "");
+	}	
+	
+	var expdate = new Date ();
+	FixCookieDate (expdate); // Correct for Mac date bug - call only once for given Date object!
+	expdate.setTime (expdate.getTime() + (30 * 24 * 60 * 60 * 1000)); // Valid for 30 days.
Index: /branches/2.0/phpgwapi/templates/classic/js/pngfix.js
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/js/pngfix.js	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/js/pngfix.js	(revision 1196)
@@ -0,0 +1,33 @@
+function correctPNG() // correctly handle PNG transparency in Win IE 5.5 or higher.
+   {
+   for(var i=0; i<document.images.length; i++)
+      {
+	  var img = document.images[i]
+	  var imgName = img.src.toUpperCase()
+	  if (imgName.substring(imgName.length-3, imgName.length) == "PNG")
+	     {
+		 var imgID = (img.id) ? "id='" + img.id + "' " : ""
+		 var imgClass = (img.className) ? "class='" + img.className + "' " : ""
+		 var imgTitle = (img.title) ? "title='" + img.title + "' " : "title='" + img.alt + "' "
+		 var imgStyle = "display:inline-block;" + img.style.cssText 
+		 var imgAttribs = img.attributes;
+		 for (var j=0; j<imgAttribs.length; j++)
+			{
+			var imgAttrib = imgAttribs[j];
+			if (imgAttrib.nodeName == "align")
+			   {		  
+			   if (imgAttrib.nodeValue == "left") imgStyle = "float:left;" + imgStyle
+			   if (imgAttrib.nodeValue == "right") imgStyle = "float:right;" + imgStyle
+			   break
+			   }
+            }
+		 var strNewHTML = "<span " + imgID + imgClass + imgTitle
+		 strNewHTML += " style=\"" + "width:" + img.width + "px; height:" + img.height + "px;" + imgStyle + ";"
+	     strNewHTML += "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader"
+		 strNewHTML += "(src=\'" + img.src + "\', sizingMethod='scale');\"></span>" 
+		 img.outerHTML = strNewHTML
+		 i = i-1
+	     }
+      }
+   }
+window.attachEvent("onload", correctPNG);
Index: /branches/2.0/phpgwapi/templates/classic/js/browserDetect.js
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/js/browserDetect.js	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/js/browserDetect.js	(revision 1196)
@@ -0,0 +1,48 @@
+/*  Script utilizado para detectar o browser
+
+	Variaveis Globais no Expresso:
+
+	OS 		-> retorna o Sistema Operacional
+	browser -> retorna o nome do Browser
+	version -> retorna a versão do Browser
+	isExplorer -> retorna true se Browser for Internet Explorer
+*/
+	var detect = navigator.userAgent.toLowerCase();
+	var OS,browser,version,total,thestring;
+	var isExplorer = false;
+
+	if (checkIt('konqueror'))
+	{
+		browser = "Konqueror";
+		OS = "Linux";
+	}
+	else if (checkIt('safari')) browser = "Safari"
+	else if (checkIt('omniweb')) browser = "OmniWeb"
+	else if (checkIt('opera')) browser = "Opera"
+	else if (checkIt('webtv')) browser = "WebTV";
+	else if (checkIt('icab')) browser = "iCab";
+	else if (checkIt('msie')) {browser = "Internet Explorer";isExplorer=true;}
+	else if (!checkIt('compatible'))
+	{
+		browser = "Netscape Navigator"
+		version = detect.charAt(8);
+	}
+	else browser = "An unknown browser";
+	
+	if (!version) version = detect.charAt(place + thestring.length);
+	
+	if (!OS)
+	{
+		if (checkIt('linux')) OS = "Linux";
+		else if (checkIt('x11')) OS = "Unix";
+		else if (checkIt('mac')) OS = "Mac"
+		else if (checkIt('win')) OS = "Windows"
+		else OS = "an unknown operating system";
+	}
+	
+	function checkIt(string)
+	{
+		place = detect.indexOf(string) + 1;
+		thestring = string;
+		return place;
+	}
Index: /branches/2.0/phpgwapi/templates/classic/js/listUsers.js
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/js/listUsers.js	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/js/listUsers.js	(revision 1196)
@@ -0,0 +1,201 @@
+//Funcoes
+	
+	function remUser(){
+		primary_group  = self.document.getElementById('primary_group_list');
+		select = self.document.getElementById('user_list');							
+			
+		for(var i = 0;i < select.options.length; i++) {
+			if(select.options[i].selected) {	
+				if(primary_group != null) {		
+					for(var j = 0;j < primary_group.options.length; j++) {
+						if(primary_group.options[j].value == select.options[i].value) {
+							primary_group.options[j] = null;
+							if(primary_group.options.length > 0)
+								primary_group.options[0].selected = true;
+							
+							break;
+						}
+					}	
+				}	
+				select.options[i--] = null;							
+			}
+		}
+		
+		if(select.options.length)
+			select.options[0].selected = true;					
+	}
+	
+	function remUserAcl(){
+		select = self.document.getElementById('user_list');								
+		for(var i = 0;i < select.options.length; i++)				
+			if(select.options[i].selected){
+				ids = getIds(select.options[i].value);
+				for(j = 0; j < ids.length; j++)
+					document.getElementById(ids[j]).disabled = true;
+				
+				select.options[i--] = null;
+			}
+		
+		if(select.options.length)
+			select.options[0].selected = true;			
+		
+		execAction('LOAD');
+	}
+	
+	function openListUsers(newWidth,newHeight,currentApp,type){			
+		
+		newScreenX  = screen.width - newWidth;		
+		newScreenY  = 0;
+
+		window.open('phpgwapi/templates/celepar/listUsers.php?'+(type == 'g' ? 'type=g&' : '')+'currentApp='+currentApp,"","width="+newWidth+",height="+newHeight+",screenX="+newScreenX+",left="+newScreenX+",screenY="+newScreenY+",top="+newScreenY+",status=1,toolbar=no,scrollbars=yes,resizable=no");
+		
+	}
+											
+	function execAction(action){
+								
+		if(!window.opener)				
+			doc = window.document;
+		else
+			doc = window.opener.document;
+		
+		select = doc.getElementById('user_list');					
+		checkAttr = doc.formAcl.checkAttr;												
+		for(i = 0; i < select.length; i++) {					
+			if(select.options[i].selected){
+				ids = getIds(select.options[i].value);
+											
+				for(j = 0; j < ids.length; j++){										
+					
+					if(action == 'SAVE') {
+						doc.getElementById(ids[j]).disabled = !checkAttr[j].checked;
+					}					
+					if(action == 'LOAD') {
+						
+						checkAttr[j].checked = !doc.getElementById(ids[j]).disabled;
+					}
+				}													
+			}			
+		}
+		
+		if(!select.length)
+			for(j = 0; j < checkAttr.length; j++)
+				checkAttr[j].disabled = true;
+				
+		else		
+			for(j = 0; j < checkAttr.length; j++)
+				checkAttr[j].disabled = false;
+			
+	}
+		
+	function getIds(value){
+			
+		ids = new Array();
+		ids[0] = value + '_1]' ;
+		ids[1] = value + '_2]' ;
+		ids[2] = value + '_4]' ;
+		ids[3] = value + '_8]' ;
+		ids[4] = value + '_16]';
+		
+		return ids;
+	}
+
+	
+ 	function optionFinder(oText) {				 		 													
+
+		for(var i = 0;i < select.options.length; i++)				
+			select.options[i--] = null;
+																							
+		for(i = 0; i < users.length; i++)
+																							
+			if(users[i].text.substring(0 ,oText.value.length).toUpperCase() == oText.value.toUpperCase() ||
+				(users[i].text.substring(0 ,3) == '(G)' &&
+				users[i].text.substring(4 ,4+oText.value.length).toUpperCase() == oText.value.toUpperCase())) {																					
+				sel = select.options;						
+				option = new Option(users[i].text,users[i].value);
+				option.onclick = users[i].onclick;				
+				sel[sel.length] = option;
+			 
+			}										  		
+ 	}			 
+ 
+ 
+ 	function addUser() {
+		var select = window.document.getElementById('user_list_in');
+		var selectOpener = window.opener.document.getElementById('user_list');
+	
+		var primary_group  = window.opener.document.getElementById('primary_group_list');
+
+		if(document.all)
+			primary_group  = window.opener.document.all['primary_group_list'];
+		
+		for (i = 0 ; i < select.length ; i++) {				
+
+			if (select.options[i].selected) {
+				isSelected = false;
+
+				for(var j = 0;j < selectOpener.options.length; j++) {																			
+					if(selectOpener.options[j].value == select.options[i].value){
+						isSelected = true;						
+						break;	
+					}
+				}
+
+				if(!isSelected){
+
+					option = window.opener.document.createElement('option');
+					option.value =select.options[i].value;
+					option.text = select.options[i].text;
+					selectOpener.options[selectOpener.options.length] = option;	
+					if(primary_group != null) {
+						primary_group.options[primary_group.options.length] = window.opener.document.createElement('option');
+						primary_group.options[primary_group.options.length - 1].value =select.options[i].value;
+						primary_group.options[primary_group.options.length - 1].text = select.options[i].text;
+					}
+					
+				}
+				
+			}
+		}
+		
+		selectOpener.options[selectOpener.options.length-1].selected = true;
+ 	}				
+ 	
+ 	function addUserAcl() {
+		var select = window.document.getElementById('user_list_in');
+		var selectOpener = window.opener.document.getElementById('user_list');
+		for (i = 0 ; i < select.length ; i++) {				
+
+			if (select.options[i].selected) {
+				isSelected = false;
+
+				for(var j = 0;j < selectOpener.options.length; j++) {																			
+					if(selectOpener.options[j].value == select.options[i].value){
+						isSelected = true;						
+						break;	
+					}
+				}
+
+				if(!isSelected){
+
+					option = window.opener.document.createElement('option');
+					option.value =select.options[i].value;
+					option.text = select.options[i].text;
+					selectOpener.options[selectOpener.options.length] = option;	
+					
+					ids = getIds(select.options[i].value);
+					for(k = 0; k < ids.length; k++) {															
+						el = window.opener.document.createElement('input');
+						el.type='hidden';
+						el.value ='Y';
+						el.name = ids[k];
+						el.disabled = true;						
+						el.id = ids[k];
+						window.opener.document.getElementById("tdHiddens").appendChild(el);
+					}
+				}
+				
+			}
+		}
+		selectOpener.options[selectOpener.options.length-1].selected = true;
+		execAction('LOAD');
+ 	} 	
Index: /branches/2.0/phpgwapi/templates/classic/js/simple_show_hide.js
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/js/simple_show_hide.js	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/js/simple_show_hide.js	(revision 1196)
@@ -0,0 +1,183 @@
+/*****************************************************
+ * ypSlideOutMenu
+ * 3/04/2001
+ * 
+ * a nice little script to create exclusive, slide-out
+ * menus for ns4, ns6, mozilla, opera, ie4, ie5 on 
+ * mac and win32. I've got no linux or unix to test on but 
+ * it should(?) work... 
+ *
+ * --youngpup--
+ *****************************************************/
+
+//var isIE = false;
+//var isOther = false;
+//var isNS4 = false;
+//var isNS6 = false;
+// constructor
+function ypSlideOutMenu(id, dir, left, top, width, height,pos)
+{
+
+	this.ie  = document.all ? 1 : 0
+		this.ns4 = document.layers ? 1 : 0
+		this.dom = document.getElementById ? 1 : 0
+
+		if (this.ie || this.ns4 || this.dom) {
+			this.id			 = id
+				this.dir		 = dir
+				this.orientation = dir == "left" || dir == "right" ? "h" : "v"
+				this.dirType	 = dir == "right" || dir == "down" ? "-" : "+"
+				this.dim		 = this.orientation == "h" ? width : height
+				//this.hideTimer	 = false
+				//this.aniTimer	 = false
+				this.open		 = false
+				this.over		 = false
+				//this.startTime	 = 0
+
+				// global reference to this object
+				//this.gRef = "ypSlideOutMenu_"+id
+				//eval(this.gRef+"=this")
+
+				// add this menu object to an internal list of all menus
+				//ypSlideOutMenu.Registry[id] = this
+
+				var d = document
+
+				var strCSS = '<style type="text/css">';
+			strCSS += '#' + this.id + 'Container { visibility:hidden; '
+				if(pos)
+				{
+					strCSS += pos+':' + left + 'px; '
+				}
+				else
+				{
+					strCSS += 'left:' + left + 'px; '
+				}
+				strCSS += 'top:' + top + 'px; '
+					strCSS += 'overflow:visible; z-index:10000; }'
+					strCSS += '#' + this.id + 'Container, #' + this.id + 'Content { position:absolute; '
+						strCSS += 'width:' + width + 'px; '
+							//		strCSS += 'height:' + height + 'px; '
+							//		strCSS += 'clip:rect(0 ' + width + ' ' + height + ' 0); '
+							strCSS += '}'
+							strCSS += '</style>';
+
+						d.write(strCSS);
+						//	alert(strCSS);
+//						this.load()
+
+					}
+		}
+
+	ypSlideOutMenu.aLs = function(layerID)
+	{
+
+		this.isIE = false;
+		this.isOther = false;
+		this.isNS4 = false;
+		this.isNS6 = false;
+		if(document.getElementById)
+		{
+			if(!document.all)
+			{
+				this.isNS6=true;
+			}
+			if(document.all)
+			{
+				this.isIE=true;
+			}
+		}
+		else
+		{
+			if(document.layers)
+			{
+				this.isNS4=true;
+			}
+			else
+			{
+				this.isOther=true;
+			}
+		}
+
+		var returnLayer;
+		if(this.isIE)
+		{
+			returnLayer = eval("document.all." + layerID + ".style");
+		}
+		if(this.isNS6)
+		{
+			returnLayer = eval("document.getElementById('" + layerID + "').style");
+		}
+		if(this.isNS4)
+		{
+			returnLayer = eval("document." + layerID);
+		}
+		if(this.isOther)
+		{
+			returnLayer = "null";
+			alert("Error:\nDue to your browser you will probably not\nbe able to view all of the following page\nas it was designed to be viewed. We regret\nthis error sincerely.");
+		}
+		return returnLayer;
+	}
+	// HideShow 1.0	Jim Cummins - http://www.conxiondesigns.com
+
+	ypSlideOutMenu.ShowL = function(ID)
+	{
+		ypSlideOutMenu.aLs(ID).visibility = "visible";
+	}
+
+	ypSlideOutMenu.HideL =function(ID)
+	{
+		ypSlideOutMenu.aLs(ID).visibility = "hidden";
+	}
+
+	ypSlideOutMenu.HideShow = function(ID)
+	{
+
+		if((ypSlideOutMenu.aLs(ID).visibility == "visible") || (ypSlideOutMenu.aLs(ID).visibility == ""))
+		{
+			ypSlideOutMenu.aLs(ID).visibility = "hidden";
+		}
+		else if(ypSlideOutMenu.aLs(ID).visibility == "hidden")
+		{
+			ypSlideOutMenu.aLs(ID).visibility = "visible";
+		}
+	}
+
+
+	ypSlideOutMenu.showMenu = function(id)
+	{
+		//temporarly hide all selectboxes to fix IE bug with z-index  
+		if(document.all)
+		{
+			for (var i=0; i<document.all.length; i++) {
+				o = document.all(i)
+					if (o.type == 'select-one' || o.type == 'select-multiple') {
+						// todo: add check for select in div?
+						if (o.style) o.style.display = 'none';
+					}
+			}
+		}
+		ypSlideOutMenu.ShowL(id+'Container');
+
+	}
+
+	ypSlideOutMenu.hide = function(id)
+	{
+		ypSlideOutMenu.HideL(id+'Container');
+		//show all selectboxes again to fix IE bug with z-index  
+		if(document.all)
+		{
+			for (var i=0; i<document.all.length; i++) {
+				o = document.all(i)
+					if (o.type == 'select-one' || o.type == 'select-multiple') {
+						// todo: add check for select in div?
+						if (o.style) o.style.display = 'inline';
+					}
+			}
+		}
+
+	}
+
+
+
Index: /branches/2.0/phpgwapi/templates/classic/js/slidereffects.js
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/js/slidereffects.js	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/js/slidereffects.js	(revision 1196)
@@ -0,0 +1,217 @@
+/*****************************************************
+ * ypSlideOutMenu
+ * 3/04/2001
+ * 
+ * a nice little script to create exclusive, slide-out
+ * menus for ns4, ns6, mozilla, opera, ie4, ie5 on 
+ * mac and win32. I've got no linux or unix to test on but 
+ * it should(?) work... 
+ *
+ * --youngpup--
+ *****************************************************/
+
+ypSlideOutMenu.Registry = []
+ypSlideOutMenu.aniLen = 250
+ypSlideOutMenu.hideDelay = 1000
+ypSlideOutMenu.minCPUResolution = 10
+
+// constructor
+function ypSlideOutMenu(id, dir, left, top, width, height,pos)
+{
+	this.ie  = document.all ? 1 : 0
+		this.ns4 = document.layers ? 1 : 0
+		this.dom = document.getElementById ? 1 : 0
+
+		if (this.ie || this.ns4 || this.dom) {
+			this.id			 = id
+				this.dir		 = dir
+				this.orientation = dir == "left" || dir == "right" ? "h" : "v"
+				this.dirType	 = dir == "right" || dir == "down" ? "-" : "+"
+				this.dim		 = this.orientation == "h" ? width : height
+				this.hideTimer	 = false
+				this.aniTimer	 = false
+				this.open		 = false
+				this.over		 = false
+				this.startTime	 = 0
+
+				// global reference to this object
+				this.gRef = "ypSlideOutMenu_"+id
+				eval(this.gRef+"=this")
+
+				// add this menu object to an internal list of all menus
+				ypSlideOutMenu.Registry[id] = this
+
+				var d = document
+
+				var strCSS = '<style type="text/css">';
+			strCSS += '#' + this.id + 'Container { visibility:hidden; '
+				if(pos)
+				{
+					strCSS += pos+':' + left + 'px; '
+				}
+				else
+				{
+					strCSS += 'left:' + left + 'px; '
+				}
+				strCSS += 'top:' + top + 'px; '
+					strCSS += 'overflow:visible; z-index:10000; }'
+					strCSS += '#' + this.id + 'Container, #' + this.id + 'Content { position:absolute; '
+						strCSS += 'width:' + width + 'px; '
+							//		strCSS += 'height:' + height + 'px; '
+							//		strCSS += 'clip:rect(0 ' + width + ' ' + height + ' 0); '
+							strCSS += '}'
+							strCSS += '</style>';
+
+						d.write(strCSS)
+
+							this.load()
+					}
+		}
+
+	ypSlideOutMenu.prototype.load = function() {
+		var d = document
+			var lyrId1 = this.id + "Container"
+			var lyrId2 = this.id + "Content"
+			var obj1 = this.dom ? d.getElementById(lyrId1) : this.ie ? d.all[lyrId1] : d.layers[lyrId1]
+			if (obj1) var obj2 = this.ns4 ? obj1.layers[lyrId2] : this.ie ? d.all[lyrId2] : d.getElementById(lyrId2)
+				var temp
+
+					if (!obj1 || !obj2) window.setTimeout(this.gRef + ".load()", 100)
+					else {
+						this.container	= obj1
+							this.menu		= obj2
+							this.style		= this.ns4 ? this.menu : this.menu.style
+							this.homePos	= eval("0" + this.dirType + this.dim)
+							this.outPos		= 0
+							this.accelConst	= (this.outPos - this.homePos) / ypSlideOutMenu.aniLen / ypSlideOutMenu.aniLen 
+
+							// set event handlers.
+							if (this.ns4) this.menu.captureEvents(Event.MOUSEOVER | Event.MOUSEOUT);
+						this.menu.onmouseover = new Function("ypSlideOutMenu.showMenu('" + this.id + "')")
+							this.menu.onmouseout = new Function("ypSlideOutMenu.hideMenu('" + this.id + "')")
+
+							//set initial state
+							this.endSlide()
+					}
+	}
+
+	ypSlideOutMenu.showMenu = function(id)
+	{
+		var reg = ypSlideOutMenu.Registry
+			var obj = ypSlideOutMenu.Registry[id]
+
+			//document.all.select.style="visibily:hidden";
+
+
+			//temporarly hide all selectboxes to fix IE bug with z-index  
+			if(document.all)
+			{
+				for (var i=0; i<document.all.length; i++) {
+					o = document.all(i)
+						if (o.type == 'select-one' || o.type == 'select-multiple') {
+							// todo: add check for select in div?
+							if (o.style) o.style.display = 'none';
+						}
+				}
+			}
+
+
+		if (obj.container) {
+			obj.over = true
+
+				// close other menus.
+				for (menu in reg) if (id != menu) ypSlideOutMenu.hide(menu)
+
+					// if this menu is scheduled to close, cancel it.
+					if (obj.hideTimer) { reg[id].hideTimer = window.clearTimeout(reg[id].hideTimer) }
+
+			// if this menu is closed, open it.
+			if (!obj.open && !obj.aniTimer) reg[id].startSlide(true)
+		}
+	}
+
+	ypSlideOutMenu.hideMenu = function(id)
+	{
+		// schedules the menu to close after <hideDelay> ms, which
+		// gives the user time to cancel the action if they accidentally moused out
+		var obj = ypSlideOutMenu.Registry[id]
+			if (obj.container) {
+				if (obj.hideTimer) window.clearTimeout(obj.hideTimer)
+					obj.hideTimer = window.setTimeout("ypSlideOutMenu.hide('" + id + "')", ypSlideOutMenu.hideDelay);
+			}
+	}
+
+	ypSlideOutMenu.hide = function(id)
+	{
+		var obj = ypSlideOutMenu.Registry[id]
+			obj.over = false
+
+			if (obj.hideTimer) window.clearTimeout(obj.hideTimer)
+
+				// flag that this scheduled event has occured.
+				obj.hideTimer = 0
+
+					// if this menu is open, close it.
+					if (obj.open && !obj.aniTimer) obj.startSlide(false)
+
+						//show all selectboxes again to fix IE bug with z-index  
+						if(document.all)
+						{
+							for (var i=0; i<document.all.length; i++) {
+								o = document.all(i)
+									if (o.type == 'select-one' || o.type == 'select-multiple') {
+										// todo: add check for select in div?
+										if (o.style) o.style.display = 'inline';
+									}
+							}
+						}
+
+
+
+	}
+
+ypSlideOutMenu.prototype.startSlide = function(open) {
+	this[open ? "onactivate" : "ondeactivate"]()
+	this.open = open
+	if (open) this.setVisibility(true)
+	this.startTime = (new Date()).getTime()	
+	this.aniTimer = window.setInterval(this.gRef + ".slide()", ypSlideOutMenu.minCPUResolution)
+}
+
+ypSlideOutMenu.prototype.slide = function() {
+	var elapsed = (new Date()).getTime() - this.startTime
+	if (elapsed > ypSlideOutMenu.aniLen) this.endSlide()
+	else {
+		var d = Math.round(Math.pow(ypSlideOutMenu.aniLen-elapsed, 2) * this.accelConst)
+		if (this.open && this.dirType == "-")		d = -d
+		else if (this.open && this.dirType == "+")	d = -d
+		else if (!this.open && this.dirType == "-")	d = -this.dim + d
+		else										d = this.dim + d
+
+		this.moveTo(d)
+	}
+}
+
+ypSlideOutMenu.prototype.endSlide = function() {
+	this.aniTimer = window.clearTimeout(this.aniTimer)
+	this.moveTo(this.open ? this.outPos : this.homePos)
+	if (!this.open) this.setVisibility(false)
+	if ((this.open && !this.over) || (!this.open && this.over)) {
+		this.startSlide(this.over)
+	}
+}
+
+ypSlideOutMenu.prototype.setVisibility = function(bShow) { 
+	var s = this.ns4 ? this.container : this.container.style
+	s.visibility = bShow ? "visible" : "hidden"
+}
+ypSlideOutMenu.prototype.moveTo = function(p) { 
+	this.style[this.orientation == "h" ? "left" : "top"] = this.ns4 ? p : p + "px"
+}
+ypSlideOutMenu.prototype.getPos = function(c) {
+	return parseInt(this.style[c])
+}
+
+// events
+ypSlideOutMenu.prototype.onactivate		= function() { }
+ypSlideOutMenu.prototype.ondeactivate	= function() { }
Index: /branches/2.0/phpgwapi/templates/classic/nextmatchs.tpl
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/nextmatchs.tpl	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/nextmatchs.tpl	(revision 1196)
@@ -0,0 +1,99 @@
+<!-- BEGIN nextmatchs -->
+ <table width="{table_width}" border="0" bgcolor="{th_bg}" cellspacing="0" cellpadding="0" cols="5">
+  <tr>   {left}
+   <td align="center" bgcolor="{th_bg}" valign="top" width="92%">{cats_search_filter_data}</td>{right}
+  </tr>
+ </table>
+<br/>
+
+<!-- END nextmatchs -->
+
+
+<!-- BEGIN filter -->
+       <td>
+{select}
+        <noscript>
+         <input type="submit" value="{lang_filter}">
+        </noscript>
+       </td>
+<!-- END filter -->
+
+
+<!-- BEGIN form -->
+<td width="2%" align="{align}" valign="top">
+<form method="POST" action="{action}" name="{form_name}">
+	{hidden}
+	<table border="0" bgcolor="{th_bg}" cellspacing="0" cellpadding="0">
+	<tr>
+		<td align="{align}">
+			<input type="image" src="{img}" border="{border}" alt="{label}" name="start" value="{start}">
+		</td>
+	</tr>
+	</table>
+</form>
+</td>
+<!-- END form -->
+
+
+<!-- BEGIN icon -->
+<td width="2%" align="{align}">&nbsp;{_link}</td>
+<!-- END icon -->
+
+
+<!-- BEGIN link -->
+<td width="2%" align="{align}" valign="top">
+	<table border="0" bgcolor="{th_bg}" cellspacing="0" cellpadding="0">
+	<tr>
+		<td align="{align}"><img src="{img}" border="{border}" alt="{label}" hspace="2" /></td>
+	</tr>
+	</table>
+</td>
+<!-- END link -->
+
+
+<!-- BEGIN search -->
+       <td>
+        <input type="text" name="query" value="{query_value}">&nbsp;{searchby}<input type="submit" name="Search" value="{lang_search}">
+       </td>
+<!-- END search -->
+
+<!-- BEGIN cats -->
+       <td>
+        {lang_category}&nbsp;&nbsp;<select name="{cat_field}" onChange="this.form.submit();">
+         <option value="0">{lang_all}</option>
+         {categories}
+        </select>
+        <noscript><input type="submit" name="cats" value="{lang_select}"></noscript>
+       </td>
+<!-- END cats -->
+
+<!-- BEGIN search_filter -->
+    <table border="0" bgcolor="{th_bg}" cellspacing="0" cellpadding="0">
+     <form method="POST" action="{form_action}" name="filter">
+      <input type="hidden" name="filter" value="{filter_value}">
+      <input type="hidden" name="qfield" value="{qfield_value}">
+      <input type="hidden" name="start" value="{start_value}">
+      <input type="hidden" name="order" value="{order_value}">
+      <input type="hidden" name="sort" value="{sort_value}">
+      <input type="hidden" name="query" value="{query_value}">
+      <tr>{search}<td>&nbsp;</td>{filter}
+      </tr>
+     </form>
+    </table>
+<!-- END search_filter -->
+
+<!-- BEGIN cats_search_filter -->
+    <table border="0" bgcolor="{th_bg}" cellspacing="0" cellpadding="0">
+     <form method="POST" action="{form_action}" name="filter">
+      <input type="hidden" name="filter" value="{filter_value}">
+      <input type="hidden" name="qfield" value="{qfield_value}">
+      <input type="hidden" name="start" value="{start_value}">
+      <input type="hidden" name="order" value="{order_value}">
+      <input type="hidden" name="sort" value="{sort_value}">
+      <input type="hidden" name="query" value="{query_value}">
+      <tr>{cats}<td>&nbsp;</td>{search}<td>&nbsp;&nbsp;</td>{filter}
+      </tr>
+     </form>
+    </table>
+<!-- END cats_search_filter -->
+
Index: /branches/2.0/phpgwapi/templates/classic/hook_settings.inc.php
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/hook_settings.inc.php	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/hook_settings.inc.php	(revision 1196)
@@ -0,0 +1,66 @@
+<?php
+	/**************************************************************************\
+	* eGroupWare - Preferences                                                 *
+	* http://www.eGroupWare.org                                                *
+	* --------------------------------------------                             *
+	*  This program is free software; you can redistribute it and/or modify it *
+	*  under the terms of the GNU General Public License as published by the   *
+	*  Free Software Foundation; either version 2 of the License, or (at your  *
+	*  option) any later version.                                              *
+	\**************************************************************************/
+	$template = $GLOBALS['phpgw_info']['server']['template_set'];
+	create_section('Preferences for the %1 template set',$template);
+
+	$start_and_logout_icons = array(
+		'yes'       => lang('yes'),
+		'no' => lang('no')
+	);
+
+	create_select_box(
+		'Show home and logout button in main application bar?',
+		'start_and_logout_icons',
+		$start_and_logout_icons,
+		'When you say yes the home and logout buttons are presented as applications in the main top applcation bar.'
+	);
+
+	create_input_box(
+		'Max number of icons in navbar',
+		'max_icons',
+		'How many icons should be shown in the navbar (top of the page). Additional icons go into a kind of pulldown menu, callable by the icon on the far right side of the navbar.','',3
+	);
+
+	create_check_box(
+		'Autohide Sidebox menu\'s',
+		'auto_hide_sidebox',
+		'Automatically hide the Sidebox menu\'s?'
+	);
+
+	$click_or_onmouseover = array(
+		'click'       => lang('Click'),
+		'onmouseover' => lang('On Mouse Over')
+	);
+
+	create_select_box(
+		'Click or Mouse Over to show menus',
+		'click_or_onmouseover',
+		$click_or_onmouseover,
+		'Click or Mouse Over to show menus?'
+	);
+
+	create_check_box(
+		'Disable slider effects',
+		'disable_slider_effects',
+		'Disable the animated slider effects when showing or hiding menus in the page? Opera and Konqueror users will probably must want this.'
+	);
+
+	create_check_box(
+		'Disable Internet Explorer png-image-bugfix',
+		'disable_pngfix',
+		'Disable the execution a bugfixscript for Internet Explorer 5.5 and higher to show transparency in PNG-images?'
+	);
+
+	create_check_box(
+		'Show page generation time',
+		'show_generation_time',
+		'Show page generation time on the bottom of the page?'
+	);
Index: /branches/2.0/phpgwapi/templates/classic/login_denylogin.tpl
===================================================================
--- /branches/2.0/phpgwapi/templates/classic/login_denylogin.tpl	(revision 1196)
+++ /branches/2.0/phpgwapi/templates/classic/login_denylogin.tpl	(revision 1196)
@@ -0,0 +1,14 @@
+
+<!-- BEGIN form -->
+<body bgcolor="#ffffff">
+<a href="http://www.egroupware.org"><img src="phpgwapi/templates/celepar/images/logo.png" alt="eGroupWare" border="0"></a>
+
+<table border="0" width="100%">
+ <tr>
+  <td align="center">
+    {deny_msg}
+  </td>
+ </tr>
+</table>
+
+<!-- END form -->
Index: /branches/2.0/admin/templates/classic/config.tpl
===================================================================
--- /branches/2.0/admin/templates/classic/config.tpl	(revision 1196)
+++ /branches/2.0/admin/templates/classic/config.tpl	(revision 1196)
@@ -0,0 +1,186 @@
+<!-- BEGIN header -->
+<form method="POST" action="{action_url}">
+<table align="center" width="85%" callspacing="0" style="{ border: 1px solid #000000; }">
+   <tr class="th">
+    <td colspan="2">&nbsp;<b>{title}</b></td>
+   </tr>
+<!-- END header -->
+<!-- BEGIN body -->
+	<tr class="row_on">
+    <td>{lang_Time_for_expire_inatives_accounts(0 for never expires)}:</td>
+    <td><input size="8" name="newsettings[time_to_account_expires]" value="{value_time_to_account_expires}"></td>
+   </tr>
+   <tr class="row_off">
+    <td>{lang_Timeout_for_sessions_in_seconds_(default_14400_=_4_hours)}:</td>
+    <td><input size="8" name="newsettings[sessions_timeout]" value="{value_sessions_timeout}"></td>
+   </tr>
+
+   <tr class="row_on">
+    <td>{lang_Timeout_for_application_session_data_in_seconds_(default_86400_=_1_day)}:</td>
+    <td><input size="8" name="newsettings[sessions_app_timeout]" value="{value_sessions_app_timeout}"></td>
+   </tr>
+
+   <tr class="row_off">
+    <td>{lang_Would_you_like_to_show_each_application's_upgrade_status_?}:</td><td>
+     <select name="newsettings[checkappversions]">
+      <option value="">{lang_No}</option>
+      <option value="Admin"{selected_checkappversions_Admin}>{lang_Admins}</option>
+      <option value="All"{selected_checkappversions_All}>{lang_All_Users}</option>
+     </select>
+    </td>
+   </tr>
+   <tr class="row_on">
+    <td>{lang_Would_you_like_to_automaticaly_load_new_langfiles_(at_login-time)_?}:</td>
+    <td>
+     <select name="newsettings[disable_autoload_langfiles]">
+      <option value="">{lang_Yes}</option>
+      <option value="True"{selected_disable_autoload_langfiles_True}>{lang_No}</option>
+     </select>
+    </td>
+   </tr>
+
+    <tr class="row_off">
+    <td>{lang_Should_the_login_page_include_a_language_selectbox_(useful_for_demo-sites)_?}:</td>
+    <td>
+     <select name="newsettings[login_show_language_selection]">
+      <option value="">{lang_No}</option>
+      <option value="True"{selected_login_show_language_selection_True}>{lang_Yes}</option>
+     </select>
+    </td>
+   </tr>
+
+   <tr class="th">
+    <td colspan="2">&nbsp;<b>{lang_security}</b></td>
+   </tr>
+
+   <tr class="row_on">
+    <td>{lang_Use_cookies_to_pass_sessionid}:</td>
+    <td>
+     <select name="newsettings[usecookies]">
+      <option value="">{lang_No}</option>
+      <option value="True"{selected_usecookies_True}>{lang_Yes}</option>
+     </select>
+    </td>
+   </tr>
+
+   <tr class="row_off">
+    <td>{lang_check_ip_address_of_all_sessions}:</td>
+    <td>
+     <select name="newsettings[sessions_checkip]">
+      <option value="">{lang_No}</option>
+      <option value="True"{selected_sessions_checkip_True}>{lang_Yes}</option>
+     </select>
+    </td>
+   </tr>
+
+   <tr class="row_on">
+    <td>{lang_Deny_all_users_access_to_grant_other_users_access_to_their_entries_?}:</td>
+    <td>
+     <select name="newsettings[deny_user_grants_access]">
+      <option value="">{lang_No}</option>
+      <option value="True"{selected_deny_user_grants_access_True}>{lang_Yes}</option>
+     </select>
+    </td>
+   </tr>
+   <tr class="row_off">
+    <td>{lang_How_many_days_should_entries_stay_in_the_access_log,_before_they_get_deleted_(default_90)_?}:</td>
+    <td>
+     <input name="newsettings[max_access_log_age]" value="{value_max_access_log_age}" size="5">
+    </td>
+   </tr>
+
+   <tr class="row_on">
+    <td>{lang_After_how_many_unsuccessful_attempts_to_login,_an_account_should_be_blocked_(default_3)_?}:</td>
+    <td>
+     <input name="newsettings[num_unsuccessful_id]" value="{value_num_unsuccessful_id}" size="5">
+    </td>
+   </tr>
+   
+   <tr class="row_off">
+    <td>{lang_After_how_many_unsuccessful_attempts_to_login,_an_IP_should_be_blocked_(default_3)_?}:</td>
+    <td>
+     <input name="newsettings[num_unsuccessful_ip]" value="{value_num_unsuccessful_ip}" size="5">
+    </td>
+   </tr>
+   
+   <tr class="row_on">
+    <td>{lang_How_many_minutes_should_an_account_or_IP_be_blocked_(default_30)_?}:</td>
+    <td>
+     <input name="newsettings[block_time]" value="{value_block_time}" size="5">
+    </td>
+   </tr>
+   
+   <tr class="row_off">
+    <td>{lang_How_many_letters_the_user_password_must_contain_(default_3)_?}:</td>
+    <td>
+     <input name="newsettings[num_letters_userpass]" value="{value_num_letters_userpass}" size="5">
+    </td>
+   </tr>
+   
+   <tr class="row_on">
+    <td>{lang_How_many_special_letters_the_user_password_must_contain_(default_0)_?}:</td>
+    <td>
+     <input name="newsettings[num_special_letters_userpass]" value="{value_num_special_letters_userpass}" size="5">
+    </td>
+   </tr>
+      
+   <tr class="row_off">
+    <td>{lang_Admin_email_addresses_(comma-separated)_to_be_notified_about_the_blocking_(empty_for_no_notify)}:</td>
+    <td>
+     <input name="newsettings[admin_mails]" value="{value_admin_mails}" size="40">
+    </td>
+   </tr>
+
+   <!--tr class="th">
+    <td colspan="2">&nbsp;<b>{lang_VoIP_settings}</b></td>
+   </tr>
+
+   <tr class="row_off">
+    <td>{lang_Enter_your_VoIP_server_address}:</td>
+    <td><input name="newsettings[voip_server]" value="{value_voip_server}"  size="40"></td>
+   </tr>   
+   <tr class="row_on">
+    <td>{lang_Enter_your_VoIP_server_url} (Ex.: /telefoniaip/servicos/voip.php):</td>
+    <td><input name="newsettings[voip_url]" value="{value_voip_url}"  size="40"></td>
+   </tr>   
+   <tr class="row_off">
+    <td>{lang_Enter_your_VoIP_server_port}:</td>
+    <td><input name="newsettings[voip_port]" value="{value_voip_port}"></td>
+   </tr-->   
+    <tr class="row_on">
+    <td >
+		{lang_use_agree_term}:
+     </td>
+	<td>
+     <select name="newsettings[use_agree_term]">
+         <option value="">{lang_No}</option>
+         <option value="True"{selected_use_agree_term_True}>{lang_Yes}</option>
+     </select>					
+	</td>
+   </tr>
+   
+  <tr class="row_off">
+    <td colspan="2">{lang_agree_term}: <br />
+								{agree_term_input} <br />
+	</td>
+   </tr>
+
+   
+<!-- END body -->
+
+<!-- BEGIN footer -->
+  <!--tr class="th">
+    <td colspan="2">
+&nbsp;
+    </td>
+  </tr-->
+  <tr>
+    <td colspan="2" align="center">
+      <input type="submit" name="submit" value="{lang_submit}">
+      <input type="submit" name="cancel" value="{lang_cancel}">
+		  <br>
+    </td>
+  </tr>
+</table>
+</form>
+<!-- END footer -->
Index: /branches/2.0/contactcenter/templates/classic/api_common.tpl
===================================================================
--- /branches/2.0/contactcenter/templates/classic/api_common.tpl	(revision 1196)
+++ /branches/2.0/contactcenter/templates/classic/api_common.tpl	(revision 1196)
@@ -0,0 +1,50 @@
+<!-- DEBUG -->
+<div id="cc_debug" style="display: none; position: absolute; top:0px; left: 1000px; width: 600px"></div>
+<!-- END DEBUG -->
+
+<!-- ContactCenter API Start -->
+<input id="cc_server_root" type="hidden" value="{cc_server_root}" />
+<input id="cc_phpgw_img_dir" type="hidden" value="{cc_phpgw_img_dir}" />
+<input id="cc_email_id_type" type="hidden" value="{cc_email_id_type}" />
+
+<!-- JS MESSAGES -->
+<input id="cc_msg_err_invalid_catalog" type="hidden" value="{cc_msg_err_invalid_catalog}" />
+<input id="cc_msg_err_contacting_server" type="hidden" value="{cc_msg_err_contacting_server}" />
+<input id="cc_msg_err_timeout" type="hidden" value="{cc_msg_err_timeout}" />
+<input id="cc_msg_err_serialize_data_unknown" type="hidden" value="{cc_msg_err_serialize_data_unknown}" />
+
+<input id="cc_msg_err_empty_field" type="hidden" value="{cc_msg_err_empty_field}" />
+<input id="cc_msg_type_state" type="hidden" value="{cc_msg_type_state}" />
+<input id="cc_msg_type_city" type="hidden" value="{cc_msg_type_city}" />
+<!-- END JS MESSAGES -->
+
+
+<input id="cc_connector_visible" type="hidden" value="{cc_connector_visible}" />
+<input id="cc_loading_1" type="hidden" value="{cc_loading_1}" />
+<input id="cc_loading_2" type="hidden" value="{cc_loading_2}" />
+<input id="cc_loading_3" type="hidden" value="{cc_loading_3}" />
+<input id="cc_loading_image" type="hidden" value="{cc_loading_image}" />
+
+<link rel="stylesheet" type="text/css" href="{cc_css}" />
+<link rel="stylesheet" type="text/css" href="{cc_dtree_css}" />
+<script type="text/javascript" src="{cc_js_aux}"></script>
+<script type="text/javascript" src="{cc_js_connector}"></script>
+<script type="text/javascript" src="{cc_js_wz_dragdrop}"></script>
+<script type="text/javascript" src="{cc_js_dtree}"></script>
+<script type="text/javascript" src="{cc_js_dtabs}"></script>
+<script type="text/javascript" src="{cc_js_djswin}"></script>
+<script type="text/javascript" src="{cc_js_catalog_tree}"></script>
+
+<div id="cc_loading" class="hidden">
+	<table class="loading" background="{cc_loading_image}"> 
+		<tr>
+			<td id="cc_loading_inner"></td>
+		</tr>
+	</table>
+</div>
+
+<script type="text/javascript">
+	var Connector = new cConnector();
+	Connector.setVisible(true);
+</script>
+<!-- ContactCenter API End -->
Index: /branches/2.0/contactcenter/templates/classic/head.inc.php
===================================================================
--- /branches/2.0/contactcenter/templates/classic/head.inc.php	(revision 1196)
+++ /branches/2.0/contactcenter/templates/classic/head.inc.php	(revision 1196)
@@ -0,0 +1,89 @@
+<?php
+	/**************************************************************************\
+	* phpGroupWare                                                             *
+	* http://www.phpgroupware.org                                              *
+	* --------------------------------------------                             *
+	*  This program is free software; you can redistribute it and/or modify it *
+	*  under the terms of the GNU General Public License as published by the   *
+	*  Free Software Foundation; either version 2 of the License, or (at your  *
+	*  option) any later version.                                              *
+	\**************************************************************************/
+
+
+	if($GLOBALS['phpgw_info']['user']['preferences']['common']['show_generation_time'])
+	{
+		$mtime = microtime(); 
+		$mtime = explode(' ',$mtime); 
+		$mtime = $mtime[1] + $mtime[0]; 
+		$GLOBALS['page_start_time'] = $mtime; 
+	}
+
+	// get used language code
+	$lang_code = $GLOBALS['phpgw_info']['user']['preferences']['common']['lang'];
+
+	$bodyheader = ' bgcolor="' . $GLOBALS['phpgw_info']['theme']['bg_color'] . '" alink="'
+		. $GLOBALS['phpgw_info']['theme']['alink'] . '" link="' . $GLOBALS['phpgw_info']['theme']['link'] . '" vlink="'
+		. $GLOBALS['phpgw_info']['theme']['vlink'] . '"';
+
+	if(!$GLOBALS['phpgw_info']['server']['htmlcompliant'])
+	{
+		$bodyheader .= '';
+	}
+
+	#_debug_array($GLOBALS['phpgw_info']['user']['preferences']['common']);
+	$theme_css = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/celepar/css/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'].'.css';
+	if(!file_exists($theme_css))
+	{
+		$theme_css = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/celepar/css/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'].'.css';
+	}
+
+	//pngfix defaults to yes
+	if(!$GLOBALS['phpgw_info']['user']['preferences']['common']['disable_pngfix'])
+	{
+		$pngfix_src = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/celepar/js/pngfix.js';
+		$pngfix ='<!-- This solves the Internet Explorer PNG-transparency bug, but only for IE 5.5 and higher --> 
+		<!--[if gte IE 5.5000]>
+		<script src="'.$pngfix_src.'" type="text/javascript">
+		</script>
+		<![endif]-->';
+	}
+
+	if(!$GLOBALS['phpgw_info']['user']['preferences']['common']['disable_slider_effects'])
+	{
+		$slider_effects_src = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/celepar/js/slidereffects.js';
+		$slider_effects = '<script src="'.$slider_effects_src.'" type="text/javascript">
+		</script>';
+	}
+	else
+	{
+		$simple_show_hide_src = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/celepar/js/simple_show_hide.js';
+		$simple_show_hide = '<script src="'.$simple_show_hide_src.'" type="text/javascript">
+		</script>';
+	}
+
+	$tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
+	$tpl->set_unknowns('remove');
+	$tpl->set_file(array('_head' => 'head.tpl'));
+	$tpl->set_block('_head','head');
+
+	$app = $GLOBALS['phpgw_info']['flags']['currentapp'];
+	$app = $app ? ' ['.(isset($GLOBALS['phpgw_info']['apps'][$app]) ? $GLOBALS['phpgw_info']['apps'][$app]['title'] : lang($app)).']':'';
+
+	$var = Array(
+		'img_icon'      => PHPGW_IMAGES_DIR . '/favicon.ico',
+		'img_shortcut'  => PHPGW_IMAGES_DIR . '/favicon.ico',
+		'pngfix'        => $pngfix,
+		'slider_effects'=> $slider_effects,
+		'simple_show_hide'=> $simple_show_hide,
+		'lang_code'=> $lang_code,
+		'charset'       => $GLOBALS['phpgw']->translation->charset(),
+		'font_family'   => $GLOBALS['phpgw_info']['theme']['font'],
+		'website_title' => $GLOBALS['phpgw_info']['server']['site_title'].$app,
+		'body_tags'     => $bodyheader .' '. $GLOBALS['phpgw']->common->get_body_attribs(),
+		'theme_css'     => $theme_css,
+		'css'           => $GLOBALS['phpgw']->common->get_css(),
+		'java_script'   => $GLOBALS['phpgw']->common->get_java_script()	);
+	$tpl->set_var($var);
+	$tpl->pfp('out','head');
+	unset($tpl);
+?>
Index: /branches/2.0/contactcenter/templates/classic/preferences.tpl
===================================================================
--- /branches/2.0/contactcenter/templates/classic/preferences.tpl	(revision 1196)
+++ /branches/2.0/contactcenter/templates/classic/preferences.tpl	(revision 1196)
@@ -0,0 +1,66 @@
+<!--
+	ContactCenter Preferences TPL File
+	Copyright (C) 2004 - Raphael Derosso Pereira 
+	(raphaelpereira@users.sourceforge.net)
+	
+	This file is licensed under the terms of th GNU GPL
+	version 2 or above
+-->
+
+<form method="POST" action="{form_action}">
+<div id="cc_pref_cards" style="width: 100%; border: 0px solid black">
+	<p align="center" style="font-weight: bold; font-size: medium; border: 0px solid black">{lang_Cards_Visualization_Preferences}</p>
+	<table align="center" style="width: 400px">
+		<tr class="th">
+			<td style="text-align: center; font-weight: bold">{lang_Option}</td>
+			<td style="text-align: center; font-weight: bold">{lang_Value}</td>
+		</tr>
+		<tr class="row_off">
+			<td>{lang_Default_Person_Email_Type}</td>
+			<td>
+				<select name="personCardEmail" style="width: 200px">
+					<option selected value="_NONE_">{lang_Choose_Email_Type...}</option>
+					{personCardEmail}
+				</select>
+			</td>
+		</tr>
+		<tr class="row_on">
+			<td>{lang_Default_Person_Telephone_Type}</td>
+			<td>
+				<select name="personCardPhone" style="width: 200px">
+					<option selected value="_NONE_">{lang_Choose_Telephone_Type...}</option>
+					{personCardPhone}
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td></td>
+			<td style="text-align: right;">
+				<input type="submit" name="save" value="{lang_Save}">
+				<input type="button" name="cancel" value="{lang_Cancel}" onclick="window.back()">
+			</td>
+		</tr>
+	</table>
+	<br>
+	<p align="center" style="font-weight: bold; font-size: medium; border: 0px solid black">{lang_Connector_Setup}</p>
+	<table align="center" style="width: 400px">
+		<tr class="th">
+			<td style="text-align: center; font-weight: bold; width: 200px">{lang_Option}</td>
+			<td style="text-align: center; font-weight: bold; width: 200px">{lang_Value}</td>
+		</tr>
+		<tr class="row_off">
+			<td>{lang_Display_Connector_Client-Server_Status_Information?}</td>
+			<td align="center">
+				<input type="checkbox" name="displayConnector" {displayConnector} />
+			</td>
+		</tr>
+		<tr>
+			<td></td>
+			<td style="text-align: right;">
+				<input type="submit" name="save" value="{lang_Save}">
+				<input type="button" name="cancel" value="{lang_Cancel}" onclick="window.back()">
+			</td>
+		</tr>
+	</table>
+</div>
+</form>
Index: /branches/2.0/contactcenter/templates/classic/search_win.tpl
===================================================================
--- /branches/2.0/contactcenter/templates/classic/search_win.tpl	(revision 1196)
+++ /branches/2.0/contactcenter/templates/classic/search_win.tpl	(revision 1196)
@@ -0,0 +1,67 @@
+{cc_api}
+
+<script type="text/javascript" src="{cc_js_search_win}"></script>
+
+<div id="cc_search" style="position: absolute; width: 450px; height: 300px; visibility: hidden; z-index: 2; border: 1px solid #999; border-top: 0px;">
+	<input id="cc_search_title" type="hidden" value="{cc_search_title}">
+	<table border="0" width="450px" height="300px" style="background: #eee">
+		<tr valign="top">
+			<td style="width: 250px">
+				<table width="100%" border="0">
+					<tr>
+						<td align="left">{cc_search_catalogues}</td>
+					</tr>
+					<tr>
+						<td align="left"><div id="cc_search_catalogues" style="position: relative; width: 250px; height: 265px; border: 1px solid #999; overflow: auto;" class="row_on"></div></td>
+					</tr>
+				</table>
+			</td>
+			<td style="width: 200px">
+				<table width="100%" height="100%" border="0">
+					<tr>
+						<td align="left" colspan="2">{cc_search_for}</td>
+					</tr>
+					<tr>
+						<td align="left" colspan="2"><input id="cc_search_for" type="text" /></td>
+					</tr>
+					<tr height="100%" valign="bottom">
+						<td align="right" height="100%" valign="bottom"><input type="button" value="{cc_search_go}" style="width: 70px" onclick="javascript: ccSearchWin.go()" /></td>
+						<td align="right" height="100%" width="1%" valign="bottom"><input type="button" value="{cc_search_cancel}" style="width: 70px" onclick="javascript:ccSearchWin.close();" /></td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
+</div>
+
+<script type="text/javascript">
+	var searchWin_load = document.body.onload;
+	var ccSearchWin, ccSearchWindow;
+
+	var searchWin_load_f = function(e)
+	{
+		ccSearchWindow = new dJSWin({'id': 'cc_search_window',
+									 'content_id': 'cc_search',
+									 'win_class': 'row_off',
+									 'width': '452px',
+									 'height': '300px',
+									 'title_color': '#3978d6',
+									 'title': Element('cc_search_title').value,
+									 'title_text_color': 'white',
+									 'button_x_img': Element('cc_phpgw_img_dir').value+'/winclose.gif',
+									 'border': true});
+
+		ccSearchWindow.draw();
+		ccSearchWin = new ccSearchWinClass({'window': ccSearchWindow, 'tree': 'ccSearchTree'});
+	}
+
+	if (is_ie)
+	{
+		//document.body.onload = function(e) {setTimeout('searchWin_load_f()'); searchWin_load ? setTimeout('searchWin_load()', 10) : false;};
+		document.body.onload = function(e) {searchWin_load_f(); searchWin_load ? searchWin_load() : false;};
+	}
+	else
+	{
+		searchWin_load_f();
+	}
+</script>
Index: /branches/2.0/contactcenter/templates/classic/email_win.tpl
===================================================================
--- /branches/2.0/contactcenter/templates/classic/email_win.tpl	(revision 1196)
+++ /branches/2.0/contactcenter/templates/classic/email_win.tpl	(revision 1196)
@@ -0,0 +1,143 @@
+{cc_api}
+
+<script type="text/javascript" src="{cc_js_search}"></script>
+<script type="text/javascript" src="{cc_js_email_win}"></script>
+<input id="cc_email_win_title" type="hidden" value="{cc_email_win_title}"/>
+<input id="cc_email_status" type="hidden" value="{cc_email_status}"/>
+<input id="cc_email_search_text" type="hidden" value="{cc_email_search_text}"/>
+<input id="cc_email_conn_1" type="hidden" value="{cc_email_conn_1}"/>
+<input id="cc_email_conn_2" type="hidden" value="{cc_email_conn_2}"/>
+<input id="cc_email_conn_3" type="hidden" value="{cc_email_conn_3}"/>
+
+<div id="cc_email_win" style="position: absolute; width: 720px;z-index:1; height: 350px; visibility: hidden;  border: 1px solid #999; border-top: 0px; background-color: #eee;">
+	<table border="0" width="100%" height="100%">
+		<tr>
+			<td>
+				<table>
+					<tr>
+						<td id="cc_email_search"></td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<table border="0" width="100%">
+					<tr>
+						<td valign="top">
+							<table border="0">
+								<tr>
+									<td>{cc_label_catalogues}</td>
+								</tr>
+								<tr>
+									<td><div id="cc_email_catalogues" style=" position: relative; width: 300px; height: 110px; border: 1px solid #999; overflow:auto" class="row_on"></div>
+									</td>
+								</tr>
+								<tr>
+									<td>{cc_label_entries}</td>
+								</tr>
+								<tr>
+									<td><select id="cc_email_win_entries" style="width: 300px; height: 110px; overflow: auto;" multiple></select></td>
+								</tr>
+							</table>
+						</td>
+						<td valign="top">
+							<table border="0" width="100%" height="100%">
+								<tr>
+									<td></td>
+									<td>{cc_label_to}</td>
+								</tr>
+								<tr>
+									<td>
+										<table>
+											<tr><td><input style="width: 90px;" type="button" value="{cc_btn_to_add}" onclick="javascript:ccEmailWin.entries_to();"></td></tr>
+											<tr><td><input style="width: 90px;" type="button" value="{cc_btn_to_del}" onclick="javascript:ccEmailWin.to_entries();"></td></tr>
+										</table>
+									</td>
+									<td><select id="cc_email_win_to" style="width: 280px; height: 65px;" multiple></select></td>
+								</tr>
+								<tr>
+									<td></td>
+									<td>{cc_label_cc}</td>
+								</tr>
+								<tr>
+									<td>
+										<table>
+											<tr><td><input style="width: 90px;" type="button" value="{cc_btn_cc_add}" onclick="javascript:ccEmailWin.entries_cc();"></td></tr>
+											<tr><td><input style="width: 90px;" type="button" value="{cc_btn_cc_del}" onclick="javascript:ccEmailWin.cc_entries();"></td></tr>
+										</table>
+									</td>
+									<td><select id="cc_email_win_cc" style="width: 280px; height: 65px;" multiple></select></td>
+								</tr>
+								<tr>
+									<td></td>
+									<td>{cc_label_cco}</td>
+								</tr>
+								<tr>
+									<td>
+										<table>
+											<tr><td><input style="width: 90px;" type="button" value="{cc_btn_cco_add}" onclick="javascript:ccEmailWin.entries_cco();"></td></tr>
+											<tr><td><input style="width: 90px;" type="button" value="{cc_btn_cco_del}" onclick="javascript:ccEmailWin.cco_entries();"></td></tr>
+										</table>
+									</td>
+									<td><select id="cc_email_win_cco" style="width: 280px; height: 65px;" multiple></select></td>
+								</tr>								
+							</table>
+						</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top">
+				<table width="100%" border="0">
+					<tr align="center">
+						<td style="width: 523px">&nbsp;</td>
+						<td style="width: 35px"><input style="width: 70px;" type="button" value="{cc_btn_ok}" onclick="javascript:ccEmailWin.ok();"></td>
+						<td style="width: 35px"><input style="width: 70px;" type="button" value="{cc_btn_cancel}" onclick="javascript:ccEmailWin.close();"></td>
+						<td style="width: 7px"></td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+		<tr>
+			<td id="cc_email_win_debug"></td>
+		</tr>
+	</table>
+</div>
+
+<!-- BOTTOM DETAILS-->
+<script type="text/javascript">
+	var emailWin_load = document.body.onload;
+	var ccEmailWin, ccEmailWindow;
+	
+	
+	var emailWin_load_f = function(e)
+	{
+		ccEmailWindow = new dJSWin({'id': 'cc_email_window',
+									'content_id': 'cc_email_win',
+									'win_class': 'row_off',
+									'width': '720px',
+									'height': '350px',
+									'title_color': '#3978d6',
+									'title': Element('cc_email_win_title').value,
+									'title_text_color': 'white',
+									'button_x_img': Element('cc_phpgw_img_dir').value+'/winclose.gif',
+									'border': true});
+
+		ccEmailWindow.draw();		
+		ccEmailWin = new ccEmailWinClass({'window': ccEmailWindow});
+		//ccEmailWin.open();
+	}
+
+	if (is_ie)
+	{		
+		document.body.onload = function(e) {emailWin_load ? emailWin_load() : false; emailWin_load_f()};
+	}
+	else
+	{
+		emailWin_load_f();
+	}
+
+</script>
+<!-- END BOTTOM DETAILS-->
Index: /branches/2.0/contactcenter/templates/classic/quickAddPlugin.tpl
===================================================================
--- /branches/2.0/contactcenter/templates/classic/quickAddPlugin.tpl	(revision 1196)
+++ /branches/2.0/contactcenter/templates/classic/quickAddPlugin.tpl	(revision 1196)
@@ -0,0 +1,31 @@
+<!--
+
+	eGroupWare - Contact Center - Quick Add Plugin Interface Template
+	Copyright (C) 2004 - Raphael Derosso Pereira
+	(raphaelpereira@users.sourceforge.net)
+
+	This file is licensed under the terms of th GNU GPL
+	version 2 or above
+	
+-->
+
+{cc_api}
+
+<div id="ccQuickAddContent" style="position: absolute; visibility: hidden">
+	<input id="ccQAnFields" type="hidden" value="{ccQAnFields}" />
+	<input id="ccQATitle" type="hidden" value="{ccQATitle}" />
+	<input id="ccQAWinHeight" type="hidden" value="{ccQAWinHeight}" />
+	
+	<div style="border: 0px solid #999;">
+		
+		{ccQAFields}
+
+	</div>
+	<div id="ccQAFuncitons" style="border: 0px solid black; width: 220px; height: 20px">
+		<input title="{ccQASave}" type="button" onclick="ccQuickAdd.send();" value="{ccQASave}" style="position: absolute; top: {ccQAFunctionsTop}; left: 55px; width: 60px" />
+		<input title="{ccQAClear}" type="button" onclick="ccQuickAdd.clear();" value="{ccQAClear}" style="position: absolute; top: {ccQAFunctionsTop}; left: 120px; width: 60px" />
+		<input title="{ccQACancel}" type="button" onclick="ccQuickAdd.clear(); ccQuickAdd.window.close();" value="{ccQACancel}" style="position: absolute; top: {ccQAFunctionsTop}; left: 185px; width: 60px" />
+	</div>
+</div>
+
+<script type="text/javascript" src="{ccQAPluginFile}"></script>
Index: /branches/2.0/contactcenter/templates/classic/addGroup.tpl
===================================================================
--- /branches/2.0/contactcenter/templates/classic/addGroup.tpl	(revision 1196)
+++ /branches/2.0/contactcenter/templates/classic/addGroup.tpl	(revision 1196)
@@ -0,0 +1,65 @@
+<!--
+
+	eGroupWare - Contact Center - Quick Add Plugin Interface Template
+	Copyright (C) 2004 - Raphael Derosso Pereira
+	(raphaelpereira@users.sourceforge.net)
+
+	This file is licensed under the terms of th GNU GPL
+	version 2 or above
+	
+-->
+{cc_api}
+
+<div align="center" id="ccAddGroupContent" style="position: absolute; visibility: hidden">
+	<input id="ccAGnFields" type="hidden" value="{ccAGnFields}" />
+	<input id="ccAGTitle" type="hidden" value="{ccAGTitle}" />
+	<input id="ccAGWinHeightIE" type="hidden" value="{ccAGWinHeightIE}" />
+	<input id="ccAGWinHeightMO" type="hidden" value="{ccAGWinHeightMO}" />
+	<input id="group_id" type="hidden">
+	<br>
+	<table border="0"  cellpadding="0" cellspacing="0" width="100%">
+		<tr height="30">
+			<td  width="17%" valign="center" align="right" nowrap>{txt_name}:</td>
+			<td  valign="center" align="left">&nbsp;&nbsp;{title}</td>
+		</tr>
+ 	</table>			
+	<br><br>			
+	<table border="0" cellpadding="0" cellspacing="0" width="95%">
+		<tr>
+			<td  align="right">
+				<table border="0" cellpadding="0" cellspacing="0">
+					<tr height="30" class="th">
+						<td  align="center">{txt_personal_contacts}</td>					
+					</tr>
+					<tr height="30" class="th">
+						<td  align="right"><span id='span_contact_list'/></td>
+					</tr>
+				</table>
+			</td>
+			<td id="buttons" width="95" align="center">
+				<button type="button" onClick="ccAddGroup.addUser()"><img src="../phpgwapi/templates/celepar/images/add.png" style="vertical-align: middle;" >&nbsp;{txt_add}</button>
+				<br><br>
+				<button type="button" onClick="ccAddGroup.remUser()"><img src="../phpgwapi/templates/celepar/images/rem.png" style="vertical-align: middle;" >&nbsp;{txt_rem}</button> 
+			</td>
+			<td  align="left">
+				<table border="0" cellpadding="0" cellspacing="0">
+					<tr height="30" class="th">
+						<td  align="center">{txt_contacts_in_list}</td>					
+					</tr>
+					<tr height="30" class="th">
+						<td  align="left"><select  id="contact_in_list" multiple name="contact_in_list[]" style="width:280px" size="10"></select></td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+		<tr>
+			<td align="center" colspan="3">
+					<br>						
+					<input title="{ccAGSave}" type="button" onclick="ccAddGroup.send();" value="{ccAGSave}" />
+					<input title="{ccAGClear}" type="button" onclick="ccAddGroup.clear();" value="{ccAGClear}" />
+					<input title="{ccAGCancel}" type="button" onclick="ccAddGroup.clear(); ccAddGroup.window.close();" value="{ccAGCancel}"/>						
+			</td>
+		</tr>
+	</table>					
+</div>
+<script type="text/javascript" src="{ccAGFile}"></script>
Index: /branches/2.0/contactcenter/templates/classic/config.tpl
===================================================================
--- /branches/2.0/contactcenter/templates/classic/config.tpl	(revision 1196)
+++ /branches/2.0/contactcenter/templates/classic/config.tpl	(revision 1196)
@@ -0,0 +1,119 @@
+<!-- BEGIN header -->
+<form method="POST" action="{action_url}">
+<table border="0" align="center">
+	<tr class="th">
+		<td colspan="2"><font color="{th_text}">&nbsp;<b>{title}</b></font></td>
+	</tr>
+	<tr>
+   		<td></td>
+	</tr>
+	<tr>
+		<td colspan="2"><b>{error}</b></td>
+	</tr>
+   <tr>
+   	<td></td>
+   </tr>
+<!-- END header -->
+<!-- BEGIN body -->
+	<tr class="th">
+		<td colspan="2" align="center"><b>{lang_ContactCenter_Global_Catalogue_Setup}</b></td>
+	</tr>
+	<tr>
+   		<td></td>
+	</tr>
+	<tr class="row_off">
+		<td>{lang_Select_where_your_Global_Catalogue_is}:</td>
+		<td>
+			<select name="newsettings[cc_global_source0]">
+				<option value="sql" {selected_cc_global_source0_sql}>SQL</option>
+				<option value="ldap" {selected_cc_global_source0_ldap}>LDAP</option>
+			</select>
+		</td>
+	</tr>
+	<tr class="row_on">
+		<td>{lang_Catalog_Name}:</td>
+		<td><input name="newsettings[cc_catalog_name]" value="{value_cc_catalog_name}" size="40" /></td>
+	</tr>
+	<tr class="row_off">
+		<td>{lang_LDAP_Host}:</td>
+		<td><input name="newsettings[cc_ldap_host0]" value="{value_cc_ldap_host0}" size="40" /></td>
+	</tr>
+	<tr class="row_on">
+		<td>{lang_LDAP_Context}:</td>
+		<td><input name="newsettings[cc_ldap_context0]" value="{value_cc_ldap_context0}" size="40" /></td>
+	</tr>
+	<tr class="row_off">
+		<td>{lang_Account_DN_to_be_used_when_browsing_LDAP}:</td>
+		<td><input name="newsettings[cc_ldap_browse_dn0]" value="{value_cc_ldap_browse_dn0}" size="40" /></td>
+	</tr>
+	<tr class="row_on">
+		<td>{lang_Password_for_the_account_above_(if_any)}:</td>
+		<td><input name="newsettings[cc_ldap_pw0]" type="password" value="" size="40" /></td>
+	</tr>
+	<tr class="row_off">
+		<td>Abrir Consulta Automática :</td>
+		<td>
+			<select name="newsettings[cc_ldap_query_automatic]">
+				<option value="true" {selected_cc_ldap_query_automatic_true}>Sim</option>	
+				<option value="false" {selected_cc_ldap_query_automatic_false}>Não</option>							
+			</select>
+		</td>
+	</tr>
+  
+  <!-- <tr class="row_on">
+  	<td>{lang_objectClass_to_be_used_as_a_Contact}:</td>
+  	<td>
+  		<select name="newsettings[cc_ldap_objectclass0]">
+			<option value="op_iop" {selected_cc_ldap_objectclass0}>organizationalPerson+inetOrgPerson</option>
+      		<option value="custom" {selected_cc_ldap_objectclass0}>{lang_Custom} {lang_(Not_implemented_yet)}</option>
+      	</select>
+  </tr>
+	<tr class="row_off">
+		<td>{lang_Custom_objectClass_name}:<br>
+			<span style="font-size: 10px;">{lang_(if_your_LDAP_contact_has_multiple_objectClass_attributes,_enter_just_one!)}</span></td>
+		<td><input name="newsettings[cc_ldap_custom_objectclass0]" type="text" value="{value_cc_ldap_custom_objectclass0}" size="40"></td>
+	</tr>
+	
+	<tr class="th"><td colspan="2" align="center"><b>{lang_Custom_LDAP_objectClass_Fields_association}</b></td></tr>
+	
+	<tr class="row_on" style="font-weight: bold;">
+	<td>{lang_ContactCenter_Field}</td><td>{lang_LDAP_field}</td>
+	</tr>
+	<tr class="row_off">
+		<td>{lang_Contact_Photo}:</td>
+		<td><input type="text" size="40" name="newsettings[cc_ldap_ass_photo0]" value="{value_cc_ldap_ass_photo0}"></td>
+	</tr>
+	<tr>
+		<td>{lang_Contact_Alias}:</td>
+		<td><input type="text" size="40" name="newsettings[cc_ldap_ass_alias0]" value="{value_cc_ldap_ass_alias0}"></td>
+	</tr>
+	<tr>
+		<td>{lang_Contact_Prefix}:</td>
+		<td><input type="text" size="40" name="newsettings[cc_ldap_ass_prefix0]" value="{value_cc_ldap_ass_prefix0}"></td>
+	</tr>
+	<tr>
+		<td>{lang_Contact_Given_Names}:</td>
+		<td><input type="text" size="40" name="newsettings[cc_ldap_ass_given0]" value="{value_cc_ldap_ass_given0}"></td>
+	</tr>
+	<tr>
+		<td>{lang_Contact_Family_Names}:</td>
+		<td><input type="text" size="40" name="newsettings[cc_ldap_ass_family0]" value="{value_cc_ldap_ass_family0}"></td>
+	</tr>
+	<tr>
+		<td>{lang_Contact_Full_Name}:</td>
+		<td><input type="text" size="40" name="newsettings[cc_ldap_ass_fulln0]" value="{value_cc_ldap_ass_fulln0}"></td>
+	</tr>-->
+<!-- END body -->
+<!-- BEGIN footer -->
+	<tr class="th">
+		<td colspan="2">&nbsp;</td>
+	</tr>
+	<tr>
+		<td colspan="2" align="center">
+			<input type="submit" name="submit" value="{lang_submit}">
+			<input type="submit" name="cancel" value="{lang_cancel}">
+		</td>
+	</tr>
+</table>
+</form>
+<!-- END footer -->
Index: /branches/2.0/contactcenter/templates/classic/index.tpl
===================================================================
--- /branches/2.0/contactcenter/templates/classic/index.tpl	(revision 1196)
+++ /branches/2.0/contactcenter/templates/classic/index.tpl	(revision 1196)
@@ -0,0 +1,253 @@
+<link rel="stylesheet" type="text/css" href="{cc_css}">
+<style>	
+	.special{
+		cursor:pointer;
+		cursor:hand;
+		position:relative; 
+		top:0px; 
+		left:0px;
+		color: #006699; 
+		background-color:#DCDCDC;
+	}
+</style>
+<script src="js/cc.js" type="text/javascript"></script>
+<!-- JS MESSAGES -->
+<input id="cc_msg_not_allowed" type="hidden" value="{cc_msg_not_allowed}">
+<input id="cc_msg_unavailable" type="hidden" value="{cc_msg_unavailable}">
+<input id="cc_msg_no_cards" type="hidden" value="{cc_msg_no_cards}">
+<input id="cc_msg_err_no_room" type="hidden" value="{cc_msg_err_no_room}">
+<input id="cc_root_dir" type="hidden" value="{cc_root_dir}">
+<input id="cc_msg_card_new" type="hidden" value="{cc_msg_card_new}">
+<input id="cc_msg_card_edit" type="hidden" value="{cc_msg_card_edit}">
+<input id="cc_msg_group" type="hidden" value="{cc_msg_group}">
+<input id="cc_msg_contact_full" type="hidden" value="{cc_msg_contact_full}">
+<input id="cc_msg_contact_qa" type="hidden" value="{cc_msg_contact_qa}">
+<input id="cc_msg_card_remove" type="hidden" value="{cc_msg_card_remove}">
+<input id="cc_msg_card_remove_confirm" type="hidden" value="{cc_msg_card_remove_confirm}">
+<input id="cc_send_mail" type="hidden" value="{cc_send_mail}">
+<input id="cc_msg_group_edit" type="hidden" value="{cc_msg_group_edit}">	
+<input id="cc_msg_group_remove" type="hidden" value="{cc_msg_group_remove}">
+<input id="cc_msg_group_remove_confirm" type="hidden" value="{cc_msg_group_remove_confirm}">
+<input id="cc_panel_search_text" type="hidden" value="{cc_panel_search}" style="cursor: pointer; cursor: hand;" onclick="javascript:ccSearch()" />
+<input id="cc_msg_close_win" type="hidden" value="{cc_msg_close_win}">
+<input id="cc_msg_import_contacts" type="hidden" value="{cc_msg_import_contacts}">
+<input id="cc_msg_export_contacts" type="hidden" value="{cc_msg_export_contacts}">
+<input id="cc_msg_expresso_info_csv" type="hidden" value="{cc_msg_expresso_info_csv}">
+<input id="cc_msg_choose_file_type" type="hidden" value="{cc_msg_choose_file_type}">
+<input id="cc_msg_outlook_express" type="hidden" value="{cc_msg_outlook_express}">
+<input id="cc_msg_outlook2k" type="hidden" value="{cc_msg_outlook2k}">
+<input id="cc_msg_expresso_default" type="hidden" value="{cc_msg_expresso_default}">
+<input id="cc_msg_choose_contacts_file" type="hidden" value="{cc_msg_choose_contacts_file}">
+<input id="cc_msg_close" type="hidden" value="{cc_msg_close}">
+<input id="cc_msg_ie_personal" type="hidden" value="{cc_msg_ie_personal}">
+<input id="cc_msg_import_fail" type="hidden" value="{cc_msg_import_fail}">
+<input id="cc_msg_export_csv" type="hidden" value="{cc_msg_export_csv}">		   
+<input id="cc_msg_automatic" type="hidden" value="{cc_msg_automatic}">
+<input id="cc_msg_importing_contacts" type="hidden" value="{cc_msg_importing_contacts}">
+<input id="cc_msg_import_finished" type="hidden" value="{cc_msg_import_finished}">
+<input id="cc_msg_invalid_csv" type="hidden" value="{cc_msg_invalid_csv}">
+<input id="cc_msg_new" type="hidden" value="{cc_msg_new}">
+<input id="cc_msg_failure" type="hidden" value="{cc_msg_failure}">
+<input id="cc_msg_exists" type="hidden" value="{cc_msg_exists}">
+<input id="cc_msg_show_more_info" type="hidden" value="{cc_msg_show_more_info}">
+<input id="cc_msg_clean" type="hidden" value="{cc_msg_clean}">
+<input id="cc_msg_choose_valid_csv" type="hidden" value="{cc_msg_choose_valid_csv}">
+<input id="cc_msg_export_error" type="hidden" value="{cc_msg_export_error}">
+<input id="cc_msg_new_email" type="hidden" value="{cc_msg_new_email}">
+<input id="cc_msg_main" type="hidden" value="{cc_msg_main}">
+<input id="cc_msg_alternative" type="hidden" value="{cc_msg_alternative}">
+<input id="cc_msg_select_email" type="hidden" value="{cc_msg_select_email}">
+<input id="cc_msg_new_phone" type="hidden" value="{cc_msg_new_phone}">
+<input id="cc_msg_home" type="hidden" value="{cc_msg_home}">
+<input id="cc_msg_cellphone" type="hidden" value="{cc_msg_cellphone}">
+<input id="cc_msg_work" type="hidden" value="{cc_msg_work}">
+<input id="cc_msg_fax" type="hidden" value="{cc_msg_fax}">
+<input id="cc_msg_pager" type="hidden" value="{cc_msg_pager}">
+<input id="cc_msg_choose_phone" type="hidden" value="{cc_msg_choose_phone}">
+<input id="cc_msg_warn_firefox" type="hidden" value="{cc_msg_warn_firefox}">
+<input id="cc_msg_firefox_half1" type="hidden" value="{cc_msg_firefox_half1}">
+<input id="cc_msg_firefox_half2" type="hidden" value="{cc_msg_firefox_half2}">
+<input id="cc_msg_click_close" type="hidden" value="{cc_msg_click_close}">
+<input id="cc_msg_install_now" type="hidden" value="{cc_msg_install_now}">
+<input id="cc_msg_install_new_firefox" type="hidden" value="{cc_msg_install_new_firefox}">
+<input id="cc_msg_close" type="hidden" value="{cc_msg_close}">
+<input id="cc_msg_outlook_express_pt" type="hidden" value="{cc_msg_outlook_express_pt}">
+<input id="cc_msg_outlook_express_en" type="hidden" value="{cc_msg_outlook_express_en}">
+<input id="cc_msg_outlook_2k_pt" type="hidden" value="{cc_msg_outlook_2k_pt}">
+<input id="cc_msg_outlook_2k_en" type="hidden" value="{cc_msg_outlook_2k_en}">
+<input id="cc_msg_moz_thunderbird" type="hidden" value="{cc_msg_moz_thunderbird}">
+<input id="cc_msg_expresso_default_csv" type="hidden" value="{cc_msg_expresso_default_csv}">
+<input id="cc_msg_copy_to_catalog" type="hidden" value="{cc_msg_copy_to_catalog}">
+<input id="cc_msg_fill_field_name" type="hidden" value="{cc_msg_fill_field_name}">
+<input id="cc_msg_add_contact_to_group" type="hidden" value="{cc_msg_add_contact_to_group}">
+
+
+ <!-- END JS MESSAGES -->
+ <input id="cc_type_contact" 	type="hidden">
+ <input id="cc_participants" 	type="hidden"  value="{cc_participants}">
+ 
+ <input id="cc_qa_alias" 		type="hidden" value="{cc_qa_alias}">
+ <input id="cc_qa_given_names" 	type="hidden" value="{cc_qa_given_names}">
+ <input id="cc_qa_family_names" type="hidden" value="{cc_qa_family_names}">
+ <input id="cc_qa_phone" 		type="hidden" value="{cc_qa_phone}">
+ <input id="cc_qa_email"		type="hidden" value="{cc_qa_email}">
+ 
+ <input id="cc_qa_save" 		type="hidden" value="{cc_qa_save}">
+ <input id="cc_qa_close"		type="hidden" value="{cc_qa_close}">
+ 
+ <input id="cc_empty" 			type="hidden"  value="{cc_empty}">
+  <!-- VIEW CARDS -->
+<table id="cc_main" width="100%" border="0" style="border: 0px solid #999;" cellpadding="1" cellspacing="1">
+	<tr width="100%">
+		<td id="cc_left" width="150px" valign="top" style="border: 0px solid #999;" height="100%">
+			<table id="cc_left_main" width="100%" height="100%" cellpadding="1" cellspacing="1" border="0">
+				<!-- __TREE -->
+				<tr>
+					<td class="th" align="center" valign="top">{cc_catalogs}</td>
+				</tr>
+				<tr>
+					<td width="150px" height="100%" align="left" valign="top"> 
+						<div id="cc_tree" style="overflow:auto;position:relative; width: 150px;border: 0px solid #999;"></div>
+					</td>
+				</tr>
+				<!-- __END TREE -->
+			</table>
+		</td>
+		<td id="cc_right" width="100%" align="center" valign="top" style="border: 0px solid #999;" height="auto">
+			<table width="100%" border="0"  cellpadding="0" cellspacing="0">
+			<!-- ___PANEL -->
+			<!--	<tr>
+					<td align="center" colspan="5">
+						<table width="100%" border="0">
+							<tr valign="top">
+								<td id="show_view_cards_tab_0" class="tab_box_active" onclick="show_view_cards_tab(0);">{cc_view_name}</td>
+								<td id="show_view_cards_tab_1" class="tab_box" onclick="show_view_cards_tab(1);">{cc_view_company}</td>
+								<td id="show_view_cards_tab_2" class="tab_box" onclick="show_view_cards_tab(2);">{cc_view_location}</td>
+							</tr>
+						</table>
+					</td>
+				</tr>-->
+				<tr align="left">
+					<td align="left">															
+					<input id="cc_button_new" onMouseOver="if(!menuStarted) menu();menu.onmouseover()" onMouseOut="menu.onmouseout()"  value="{cc_btn_new}" type="button">					
+					<div id="cc_panel_search_call" style="display: inline"></div>
+					<div id="cc_panel_table" style="display: none; text-align: right">
+					<input type="button" value="{cc_panel_table}" class="tab_box" style="cursor: pointer; cursor: hand;" onclick="javascript: ccChangeVisualization('table')" />
+					</div>
+					<div id="cc_panel_cards" style="display: inline; text-align: right">
+					<input type="button" value="{cc_panel_cards}" class="tab_box" style="cursor: pointer; cursor: hand;" onclick="javascript: ccChangeVisualization('cards')" />					
+					</div>
+					</td>
+					<td align="right">
+					<input id="cc_button_tools" value="{cc_btn_import_export}" type="button" onclick="javascript:ccIEContacts.showList()">
+					</td>
+				</tr>
+				<tr>
+					<td align="center" colspan="2">
+					<div id="cc_panel_letters" style="display:inline">
+						<table width="100%" border="0">
+							<tr valign="top">
+								<td id="cc_letter_0" class="letter_box" onclick="showCards('number', getActualPage()); selectLetter(0);">123...</td>
+								<td id="cc_letter_1" class="letter_box_active" onclick="showCards('a', getActualPage()); selectLetter(1);">A</td>
+								<td id="cc_letter_2" class="letter_box" onclick="showCards('b', getActualPage()); selectLetter(2);">B</td>
+								<td id="cc_letter_3" class="letter_box" onclick="showCards('c', getActualPage()); selectLetter(3);">C</td>
+								<td id="cc_letter_4" class="letter_box" onclick="showCards('d', getActualPage()); selectLetter(4);">D</td>
+								<td id="cc_letter_5" class="letter_box" onclick="showCards('e', getActualPage()); selectLetter(5);">E</td>
+								<td id="cc_letter_6" class="letter_box" onclick="showCards('f', getActualPage()); selectLetter(6);">F</td>
+								<td id="cc_letter_7" class="letter_box" onclick="showCards('g', getActualPage()); selectLetter(7);">G</td>
+								<td id="cc_letter_8" class="letter_box" onclick="showCards('h', getActualPage()); selectLetter(8);">H</td>
+								<td id="cc_letter_9" class="letter_box" onclick="showCards('i', getActualPage()); selectLetter(9);">I</td>
+								<td id="cc_letter_10" class="letter_box" onclick="showCards('j', getActualPage()); selectLetter(10);">J</td>
+								<td id="cc_letter_11" class="letter_box" onclick="showCards('k', getActualPage()); selectLetter(11);">K</td>
+								<td id="cc_letter_12" class="letter_box" onclick="showCards('l', getActualPage()); selectLetter(12);">L</td>
+								<td id="cc_letter_13" class="letter_box" onclick="showCards('m', getActualPage()); selectLetter(13);">M</td>
+								<td id="cc_letter_14" class="letter_box" onclick="showCards('n', getActualPage()); selectLetter(14);">N</td>
+								<td id="cc_letter_15" class="letter_box" onclick="showCards('o', getActualPage()); selectLetter(15);">O</td>
+								<td id="cc_letter_16" class="letter_box" onclick="showCards('p', getActualPage()); selectLetter(16);">P</td>
+								<td id="cc_letter_17" class="letter_box" onclick="showCards('q', getActualPage()); selectLetter(17);">Q</td>
+								<td id="cc_letter_18" class="letter_box" onclick="showCards('r', getActualPage()); selectLetter(18);">R</td>
+								<td id="cc_letter_19" class="letter_box" onclick="showCards('s', getActualPage()); selectLetter(19);">S</td>
+								<td id="cc_letter_20" class="letter_box" onclick="showCards('t', getActualPage()); selectLetter(20);">T</td>
+								<td id="cc_letter_21" class="letter_box" onclick="showCards('u', getActualPage()); selectLetter(21);">U</td>
+								<td id="cc_letter_22" class="letter_box" onclick="showCards('v', getActualPage()); selectLetter(22);">V</td>
+								<td id="cc_letter_23" class="letter_box" onclick="showCards('w', getActualPage()); selectLetter(23);">W</td>
+								<td id="cc_letter_24" class="letter_box" onclick="showCards('x', getActualPage()); selectLetter(24);">X</td>
+								<td id="cc_letter_25" class="letter_box" onclick="showCards('y', getActualPage()); selectLetter(25);">Y</td>
+								<td id="cc_letter_26" class="letter_box" onclick="showCards('z', getActualPage()); selectLetter(26);">Z</td>
+								<td id="cc_letter_27" class="letter_box" onclick="showCards('all', getActualPage()); selectLetter(27);">{cc_all}</td>
+							</tr>
+						</table>
+					</div>
+					<div id="cc_panel_search" style="display: none">
+						<table width="100%" border="0">
+							<tr valign="top">
+								<td class="letter_box" colspan="2" style="width: 10%" onclick="ccSearchHide()">123ABC...</td>
+								<td class="letter_box_active" style="text-align: center; text-valign: middle">{cc_panel_search_found}</td>
+							</tr>
+						</table>
+					</div>
+					</td>
+				</tr>
+				<tr class="th">
+					<td colspan="2">
+						<table cellpadding="0" cellspacing="0" width="100%" border="0">
+							<tr>
+								<td>
+									<table bgcolor="#D3DCE3" cellspacing="0" cellpadding="0" border="0">
+										<tr>
+											<td align="left" valign="middle"><span id="cc_panel_arrow_first"><img src="templates/default/images/first-grey.png" border="0" alt="{cc_panel_first_page}" hspace="2" onclick="javascript:false"/></span></td>
+										</tr>
+									</table>
+								</td>
+								<td width="2%" align="right" valign="center">
+									<table bgcolor="#D3DCE3" cellspacing="0" cellpadding="0" border="0">
+										<tr>
+											<td align="left" valign="middle"><span id="cc_panel_arrow_previous"><img src="templates/default/images/left-grey.png" border="0" alt="{cc_panel_previous_page}" hspace="2" onclick="" /></span></td>
+										</tr>
+									</table>
+								</td>
+								<td align="center" bgcolor="#D3DCE3" valign="center" width="92%">
+									<table bgcolor="#D3DCE3" cellspacing="0" cellpadding="0" border="0">
+										<tr>
+											<td id="cc_panel_pages"></td>
+										</tr>
+									</table>
+								</td>
+								<td width="2%" align="left" valign="center">
+									<table bgcolor="#D3DCE3" cellspacing="0" cellpadding="0" border="0">
+										<tr>
+											<td align="left" valign="middle"><span id="cc_panel_arrow_next"><img src="templates/default/images/right-grey.png" border="0" alt="{cc_panel_next_page}" hspace="2" /></span></td>
+										</tr>
+									</table>
+								</td>
+								<td width="2%" align="right" valign="center">
+									<table bgcolor="#D3DCE3" cellspacing="0" cellpadding="0" border="0">
+										<tr>
+											<td align="left" valign="middle"><span id="cc_panel_arrow_last"><img src="templates/default/images/last-grey.png" border="0" alt="{cc_panel_last_page}" hspace="2" /></span></td>
+										</tr>
+									</table>			
+								</td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+				<!-- ___END PANEL -->
+				<!-- __CARDS -->				
+				<tr>
+					<td style="border: 0px solid #666;" id="cc_card_space" width="100%" height="auto" valign="top" align="center" colspan="4"></td>
+				</tr>												
+				<!-- __END CARDS -->
+			</table>
+		</td>
+	</tr>
+</table>
+	<div id="Layer1" style="position:absolute; top:178px; left:183px;width:auto; padding:2px; z-index:100000; background-color:#F2F3ED; border:1px solid #999999;visibility:hidden"></div>
+	<div id="debug_layer" style="position:absolute;width:0px;height:0px;display:none"></div>
+<!-- _END VIEW CARDS -->
+<!-- BOTTOM DETAILS-->
+<script type="text/javascript" src="js/moo.fx.js"></script>
+<script type="text/javascript" src="js/ccListParticipants.js"></script>
+<script type="text/javascript" src="js/ccQuickAddContact.js"></script>
+<script type="text/javascript" src="js/ccIEContacts.js"></script>
+<script type="text/javascript" src="js/ccMain.js"></script>
+<!-- END BOTTOM DETAILS-->						
Index: /branches/2.0/contactcenter/templates/classic/full_add.tpl
===================================================================
--- /branches/2.0/contactcenter/templates/classic/full_add.tpl	(revision 1196)
+++ /branches/2.0/contactcenter/templates/classic/full_add.tpl	(revision 1196)
@@ -0,0 +1,298 @@
+{cc_api}
+
+<!-- JS MESSAGES -->
+<!--input id="cc_msg_err_empty_field" type="hidden" value="{cc_msg_err_empty_field}"-->
+<!--input id="cc_msg_type_state" type="hidden" value="{cc_msg_type_state}"-->
+<!--input id="cc_msg_type_city" type="hidden" value="{cc_msg_type_city}"-->
+<!-- END JS MESSAGES -->
+
+
+<!-- WINDOW CONTACT -->
+<iframe id="cc_photo_frame" style="position: absolute; top: 0px; left: 0px; visibility:hidden"></iframe>
+<input id="cc_contact_title" type="hidden" value="{cc_contact_title}">
+<input id="cc_contact_personal" type="hidden" value="{cc_contact_personal}">
+<input id="cc_contact_addrs" type="hidden" value="{cc_contact_addrs}">
+<input id="cc_contact_conns" type="hidden" value="{emails_telephones}">
+<input id="cc_pd_full_name" name="{cc_pd_full_name}" type="hidden">
+<input id="cc_pd_sex" name="{cc_pd_sex}" type="hidden">
+<input id="cc_addr_other" name="{cc_addr_other}" type="hidden">
+<input id="cc_addr_po_box" name="{cc_addr_po_box}" type="hidden">
+<!-- _PERSONAL DATA -->
+<div id="cc_contact_tab_0" class="row_off div_cc_contact_tab" style="left:-498;top:-347;position: absolute;visibility: hidden;height:197px">
+	<form id="cc_full_add_form_personal">
+	<input id="cc_full_add_contact_id" type="text" style="display: none">
+	<table align="center" width="498px" height="197px" class="row_off" border="0">
+		<tr class="row_off">
+			<td align="right">{cc_pd_select_photo}:</td>
+			<td align="left" colspan="2">
+				<!-- Mozilla Method -->
+				<input id="cc_pd_select_photo" type="file" accept="image/gif,image/jpeg,image/png" name="cc_pd_photo" onchange="Element('cc_pd_photo').src = 'file://'+Element('cc_pd_select_photo').value">
+				<!-- IE Method -->
+				<input id="cc_pd_select_photo_t" type="text" name="cc_pd_select_photo_t" readonly>
+				<input id="cc_pd_select_photo_b" type="button" style="width: 60px" value="{cc_pd_select_photo_b}" onclick="Element('cc_photo_frame').contentWindow.document.all['cc_photo_input'].click();">
+			</td>
+			<td align="center" colspan="2" rowspan="3"><img id="cc_pd_photo" src="templates/default/images/photo.png" border="0" width="60px" height="80px"></td>
+		</tr>
+		<tr class="row_on">
+			<td align="right">{cc_pd_alias}:</td>
+			<td align="left" colspan="2"><input id="cc_pd_alias" name="{cc_pd_alias}" type="text" style="width:175px;z-index:-1" value="" maxlength=""></td>
+		</tr>
+		<tr style="display:none" class="row_off">
+			<td align="right">{cc_pd_prefix}:</td>
+			<td align="left" colspan="2"><select id="cc_pd_prefix" name="{cc_pd_prefix}" style="width: 175px;"><option value='0'>{cc_pd_choose_prefix}</option></select></td>
+		</tr>
+		<tr class="row_on">
+			<td align="right">{cc_pd_given_names}:</td>
+			<td align="left" colspan="2"><input id="cc_pd_given_names" name="{cc_pd_given_names}" type="text" style="width: 175px;" value="" maxlength=""></td>
+		</tr>
+		<tr class="row_on">
+			<td align="right">{cc_pd_family_names}:</td>
+			<td align="left"><input id="cc_pd_family_names" name="{cc_pd_family_names}" type="text" style="width: 175px;" value="" maxlength=""></td>
+			<td align="right">{cc_pd_birthdate}:</td>
+			<td align="left">
+				<input id="cc_pd_birthdate_0" style="text-align: center;" title="{cc_pd_birthdate_0}" name="{cc_pd_birthdate_0}" type="text" maxlength="{cc_pd_birth_size_0}" size="{cc_pd_birth_size_0}">
+				<input id="cc_pd_birthdate_1" style="text-align: center;" title="{cc_pd_birthdate_1}" name="{cc_pd_birthdate_1}" type="text" maxlength="{cc_pd_birth_size_1}" size="{cc_pd_birth_size_1}">
+				<input id="cc_pd_birthdate_2" style="text-align: center;" title="{cc_pd_birthdate_2}" name="{cc_pd_birthdate_2}" type="text" maxlength="{cc_pd_birth_size_2}" size="{cc_pd_birth_size_2}">
+			</td>
+		</tr>
+		<tr style="display:none" class="row_off">
+			<td align="right">{cc_pd_suffix}:</td>
+			<td align="left" colspan="3"><select id="cc_pd_suffix" name="{cc_pd_suffix}" style="width: 175px;"><option value="0">{cc_pd_choose_suffix}</option></select></td>
+		</tr>
+		<tr class="row_on">
+			<td align="right">{cc_pd_gpg_finger_print}:</td>
+			<td colspan="3" align="left"><input id="cc_pd_gpg_finger_print" name="{cc_pd_gpg_finger_print}" type="text" style="width: 350px;" value="" maxlength=""></td>
+		</tr>
+		<tr class="row_off">
+			<td align="right">{cc_pd_notes}:</td>
+			<td colspan="3" align="left"><textarea id="cc_pd_notes" name="{cc_pd_notes}" style="width: 350px; height: 60px;"></textarea></td>
+		</tr>
+	</table>
+	</form>
+</div>
+
+<!-- _ADDRESSES -->
+<div id="cc_contact_tab_1" class="row_off div_cc_contact_tab" style="position: absolute; visibility: hidden;height:197px;">
+	<form id="cc_full_add_form_addrs">
+	<table align="center" width="498px" height="197px" border="0">
+		<tr class="row_off">
+			<td align="right">{cc_addr_types}:</td>
+			<td align="left" colspan="3">
+				<select id="cc_addr_types" name="{cc_addr_types}" style="width: 200px;" onchange="updateAddressFields()">
+					<option value="_NONE_">{cc_addr_choose_types}</option>
+				</select>
+			</td>
+		</tr>
+		<tr class="row_on">
+			<td align="right">{cc_addr_countries}:</td>
+			<td align="left" colspan="3">
+				<select id="cc_addr_countries" name="{cc_addr_countries}" style="width: 200px;" onchange="updateAddrStates()">
+					<option value="_NONE_">{cc_addr_choose_countries}</option>
+					{cc_addr_country_list}
+				</select>
+			</td>
+		</tr>
+		<tr class="row_off">
+			<td align="right">{cc_addr_states}:</td>
+			<td align="left" colspan="3">
+				<select id="cc_addr_states" name="{cc_addr_states}" style="width: 200px;" onchange="updateAddrCities();">
+					<option value="_NONE_">{cc_addr_choose_states}</option>
+				</select>
+				<input id="cc_addr_states_new" style="display:none;width: 150px;" type="text" onmouseover="updateAddrNewStateOnMouseOver();" onmouseout="updateAddrNewStateOnMouseOut();">
+			</td>
+		</tr>
+		<tr class="row_on">
+			<td align="right">{cc_addr_cities}:</td>
+			<td align="left" colspan="3">
+				<select id="cc_addr_cities" style="width: 200px;" onchange="updateAddrFillingFields();">
+					<option value="_NONE_">{cc_addr_choose_cities}</option>
+				</select>
+				<input id="cc_addr_cities_new" style="display:none;width: 150px;" type="text" onmouseover="updateAddrNewCityOnMouseOver();" onmouseout="updateAddrNewCityOnMouseOut();">
+			</td>
+		</tr>
+		<tr class="row_off">
+			<td align="right">{cc_addr_1}:</td>
+			<td align="left"><input id="cc_addr_1" name="{cc_addr_1}" style="width: 200px;" type="text" name="" value=""></td>
+			<td align="right">{cc_addr_complement}:</td>
+			<td align="left"><input id="cc_addr_complement" name="{cc_addr_complement}" style="width: 100px;" type="text" name="" value=""></td>
+		</tr>
+		<tr class="row_on">
+			<td align="right">{cc_addr_2}:</td>
+			<td align="left"><input id="cc_addr_2" name="{cc_addr_2}" style="width: 200px;" type="text" name="" value=""></td>
+			<td align="right">{cc_addr_postal_code}:</td>
+			<td align="left"><input id="cc_addr_postal_code" name="{cc_addr_postal_code}"style="width: 70px;" type="text" name="" value=""></td>
+		</tr>
+		<tr class="row_off">
+			<td align="right">{cc_addr_is_default}:</td>
+			<td colspan="3" align="left"><input id="cc_addr_is_default" type="checkbox" name=""></td>
+		</tr>
+		<tr style="visibility: hidden; position: absolute;">
+			<td><input id="cc_addr_id" type="hidden"></td>
+		</tr>
+	</table>
+	</form>
+</div>
+
+<!-- _CONNECTIONS -->
+<div id="cc_contact_tab_2" class="row_off div_cc_contact_tab" style="position: absolute; visibility: hidden;height:247px;width:498px">
+	<table align="left" width="100%"  height="247px" border=0>
+	<tbody>
+		<tr class="th" width="100%" align="center" height="10px">
+			<td width="60px" noWrap><input type="radio"  name="cc_conn_type" id="cc_conn_type_1" value="Email" onclick="javascript:updateConnFields();">{email}</td>
+			<td width="60px" noWrap><input type="radio" name="cc_conn_type" id="cc_conn_type_2" value="Telefone" onclick="javascript:updateConnFields();">{telephone}</td>
+			<td width="*" align="left"><select style="width:160px" id="cc_conn_type_sel" onchange="javascript:connAddNewLine();"><option value="-1">{choose_email_telephone}</option></select></td>
+		</tr>
+		<tr class="row_off">			
+			<td valign="top" colspan="4" width="100%" style="border: 0px solid black" cellpadding="0" cellspacing="0">
+				<table align="left" width="100%" style="border: 0px solid black">
+				<tbody id="cc_conn">&nbsp;
+					<!-- Code inside here is inserted dynamically -->
+				</tbody>				
+				</table>
+			</td>
+		</tr>
+	</tbody>
+	<tbody>
+		<tr>
+			<td align="center" colspan="4">&nbsp;</td>
+		</tr>
+	</tbody>
+	</table>
+	<div style="z-index:10000;position: absolute;display:none; top: 170px; left: 78px;" id="div_cc_conn_is_default"> {cc_default} &nbsp;<select id="cc_email_default" name="cc_email_default" disabled style="display:none"></select><select id="cc_phone_default" name="cc_phone_default" disabled style="display:none"></select></div>
+</div>
+<!-- _BOTTOM BUTTONS -->
+<div align="center" id="cc_contact_tab_buttons" style="position: absolute; visibility: hidden; top: 250px; left: 0px; width: 498px; height: 32px; border: 0px solid black">	
+	<table class="row_off" align="center" width="498px" cellpadding="2" cellspacing="0" border="0">
+		<tr>
+			<td align="center">
+				<input id="cc_contact_save" style="width: 100px;" type="button" value="{cc_contact_save}" onclick="javascript:postFullAdd();">
+				<input id="cc_contact_reset" style="width: 100px;" type="button" value="{cc_contact_reset}" onclick="javascript:resetFullAdd();">
+				<input id="cc_contact_cancel" style="width: 100px;" type="button" value="{cc_contact_cancel}" onclick="javascript:closeFullAdd();">
+			</td>
+		</tr>
+	</table>
+</div>
+
+<script type="text/javascript">
+<!--
+//	Overloading some methods for fix cursor problem in Firefox.
+	if(!is_ie) { 
+		dJSWin.prototype.close = function() {		
+			dJSWin.state = 0;
+			dd.elements[this.title.id].hide();
+			if ( dd_div = document.getElementById('divScrollMain'))	
+				Element("divScrollMain").style.overflow = 'auto';	
+		}
+		dJSWin.prototype.open = function() {
+			this.moveTo(window.innerWidth/2 + window.pageXOffset - dd.elements[this.title.id].w/2,
+			    window.innerHeight/2 + window.pageYOffset - dd.elements[this.clientArea.id].h/2);
+			dd.elements[this.title.id].maximizeZ();
+			dd.elements[this.title.id].show();
+			if ( dd_div = document.getElementById('divScrollMain'))
+				dd_div.style.overflow = 'hidden';
+		}
+	}	
+		
+	var fullAdd_onload = document.body.onload;
+	var tabs;
+	var fullAddWin;
+	var photo_frame, photo_form, photo_input;	
+
+	__f = function(e)
+	{
+		
+		tabs = new dTabsManager({'id': 'cc_contact_tab', 'width': '500px'});
+		
+		tabs.addTab({'id': 'cc_contact_tab_0', 
+					 'name': Element('cc_contact_personal').value, 
+					 'selectedClass': 'tab_box_active', 
+					 'unselectedClass': 'tab_box'});
+					 
+		tabs.addTab({'id': 'cc_contact_tab_2', 
+					 'name': Element('cc_contact_conns').value, 
+					 'selectedClass': 'tab_box_active', 
+					 'unselectedClass': 'tab_box'});
+
+		tabs.addTab({'id': 'cc_contact_tab_1', 
+					 'name': Element('cc_contact_addrs').value, 
+					 'selectedClass': 'tab_box_active', 
+					 'unselectedClass': 'tab_box'});					 
+
+		fullAddWin = new dJSWin({'id': 'cc_full_add_window',
+		                         'content_id': 'cc_contact_tab',
+					 'win_class': 'row_off',
+					 'width': '500px',
+					 'height': '273px',
+					 'title_color': '#3978d6',
+					 'title': Element('cc_contact_title').value,
+					 'title_text_color': 'white',
+					 'button_x_img': Element('cc_phpgw_img_dir').value+'/winclose.gif',
+					 'include_contents': new Array('cc_contact_tab_0', 'cc_contact_tab_1', 'cc_contact_tab_2','cc_contact_tab_buttons'),
+					 'border': true});
+
+		fullAddWin.draw();
+
+		if (is_ie)
+		{
+			Element('cc_photo_frame').src = 'cc_photo_frame.html';
+			Element('cc_pd_select_photo').style.display='none';
+			fullAddWin.open();
+			tabs._showTab('cc_contact_tab_0');
+			fullAddWin.close();
+		}
+		else
+		{
+			Element('cc_pd_select_photo_t').style.display='none';
+			Element('cc_pd_select_photo_b').style.display='none';			
+		}
+		
+	};
+
+	if (is_ie) // || is_moz1_6)
+	{
+			
+		document.body.onload = function(e) { setTimeout('__f()', 10); fullAdd_onload ? setTimeout('fullAdd_onload()'): false;};
+	}
+	else
+	{
+//		__f();
+	}
+
+//-->
+</script>
+<!-- END WINDOW CONTACT -->
+
+
+
+
+
+
+
+
+
+
+<!-- RELATIONS 
+<div id="cc_contact_tab_3" class="row_off div_cc_contact_tab">
+	<table align="center" width="500px" height="100%" cellpadding="2" cellspacing="0" border="0">
+		<tr class="row_off">
+			<td align="right"><input style="width: 240px;" type="text"></td>
+			<td align="left"><input style="width: 150px;" type="button" value="{cc_btn_search}"></td>
+		</tr>
+		<tr class="row_on">
+			<td align="left">{cc_results}:</td>
+			<td align="left">{cc_is_my}:</td>
+		</tr>
+		<tr class="row_off">
+			<td align="right"><select style="width: 240px; height: 150px;" multiple></select></td>
+			<td align="left"><select id="cc_rels_type" style="width: 240px; height: 150px;" multiple></select></td>
+		</tr>
+		<tr class="row_on">
+			<td align="right"><input style="width: 150px;" type="button" value="{cc_add_relation}"></td>
+			<td align="left"><input style="width: 150px;" type="button" value="{cc_del_relation}"></td>
+		</tr>
+		<tr class="row_off">
+			<td align="center" colspan="2"><select style="width: 480px; height: 120px;" multiple></select></td>
+		</tr>
+	</table>
+</div>
+-->
Index: /branches/2.0/contactcenter/templates/classic/views.tpl
===================================================================
--- /branches/2.0/contactcenter/templates/classic/views.tpl	(revision 1196)
+++ /branches/2.0/contactcenter/templates/classic/views.tpl	(revision 1196)
@@ -0,0 +1,83 @@
+<!-- LAYER VIEWS -->
+<!--
+<div id="cc_layer_views" style="position: absolute; left: 0px; top: 0px; width: 100%; height: 100%; visibility: hidden; z-index: 0; border: 0px solid #999;">
+<table width="100%" height="100%" border="0">
+	<tr>
+		<td align="center" valign="top">
+			<table id="" cellpadding="3" cellspacing="2" border="0">
+				<tr class="th">
+					<td>Stage 1: Edit Name</td>
+					<td>Select View</td>
+					<td colspan="2">Type Of Catalogue</td>
+				</tr>
+				<tr class="row_on">
+					<td><input style="width: 150px;" type="text" value=""></td>
+					<td><select style="width: 150px;"><option>Choose a View...</option></select></td>
+					<td colspan="2"><select style="width: 150px;"><option>Choose a Catalogue...</option></select></td>
+				</tr>
+				<tr class="th">
+					<td colspan="4">Stage 2: Criteria Of Search</td>
+				</tr>
+				<tr class="row_on">
+					<td><select style="width: 150px;"><option>Choose a Field...</option></select></td>
+					<td><select style="width: 150px;"><option>Choose a Criteria...</option></select></td>
+					<td><input style="width: 150px;" type="text"></td>
+					<td>and</td>
+				</tr>
+				<tr class="row_off">
+					<td><select style="width: 150px;"><option>Choose a Field...</option></select></td>
+					<td><select style="width: 150px;"><option>Choose a Criteria...</option></select></td>
+					<td><input style="width: 150px;" type="text"></td>
+					<td>and</td>
+				</tr>
+				<tr class="row_on">
+					<td><select style="width: 150px;"><option>Choose a Field...</option></select></td>
+					<td><select style="width: 150px;"><option>Choose a Criteria...</option></select></td>
+					<td><input style="width: 150px;" type="text"></td>
+					<td>and</td>
+				</tr>
+				<tr class="row_off">
+					<td><select style="width: 150px;"><option>Choose a Field...</option></select></td>
+					<td><select style="width: 150px;"><option>Choose a Criteria...</option></select></td>
+					<td colspan="2"><input style="width: 150px;" type="text"></td>
+				</tr>
+				<tr class="th">
+					<td colspan="4">Stage 3: Select Colums</td>
+				</tr>
+				<tr class="row_on">
+					<td><select style="width: 150px;"><option>Choose a Field...</option></select></td>
+					<td><select style="width: 150px;"><option>Choose a Field...</option></select></td>
+					<td colspan="2"><select style="width: 150px;"><option>Choose a Field...</option></select></td>
+				</tr>
+				<tr class="row_off">
+					<td><select style="width: 150px;"><option>Choose a Field...</option></select></td>
+					<td><select style="width: 150px;"><option>Choose a Field...</option></select></td>
+					<td colspan="2"><select style="width: 150px;"><option>Choose a Field...</option></select></td>
+				</tr>
+				<tr class="th">
+					<td colspan="4">Stage 4: Visibility</td>
+				</tr>
+				<tr class="row_on">
+					<td colspan="4"><label><input type="radio" id="radio_visibility_1" name="radio_visibility">This model of exhibition could be had access by all the users</label></td>
+				</tr>
+				<tr class="row_off">
+					<td colspan="4"><label><input type="radio" id="radio_visibility_2" name="radio_visibility" checked>This model of exhibition could be had access only by me</label></td>
+				</tr>
+				<tr class="th"><td colspan="4">&nbsp;</td></tr>
+				<tr>
+					<td align="left">
+						<input type="button" value="Save">
+					</td>
+					<td colspan="2"></td>
+					<td align="right">
+						<input type="button" value="Cancel" onclick="set_loading('show_layer(\'cc_layer_view_cards\')');">
+					</td>
+				</tr>
+			</table>
+		</tr>
+	</table>
+</div>
+-->
+<!-- LAYER VIEWS -->
+
+
Index: /branches/2.0/contactcenter/templates/classic/contacts.tpl
===================================================================
--- /branches/2.0/contactcenter/templates/classic/contacts.tpl	(revision 1196)
+++ /branches/2.0/contactcenter/templates/classic/contacts.tpl	(revision 1196)
@@ -0,0 +1,132 @@
+<script type="text/javascript" src="{cc_js_contacts}"></script>
+<script type="text/javascript" src="{cc_js_wz_dragdrop}"></script>
+
+<div id="cc_email_win_title" style="position:absolute; width: 500px; height: 20px; visibility: hidden; z-index: 0; border: 1px solid #999; font-weight: bold; border-bottom: 0px;" class="th">
+	<table border="0" width="100%" height="100%" cellpadding="2" cellspacing="0">
+        <tr>
+			<td align="left" valign="top" width="99%">{cc_email_win_title}</td>
+			<td align="center" valign="top" width="1%">
+				<img id="cc_email_win_close" alt="{cc_search_close}" src="{phpgw_img_dir}/winclose.gif" width="16px" height="16px" onclick="dd.elements.cc_email_win_title.hide();" 
+				style="cursor: pointer; cursor: hand;">
+			</td>
+		</tr>
+	</table>																					
+</div>
+
+<div id="cc_email_win" style="position: absolute; width: 500px; height: 400px; visibility: hidden; z-index: 0; border: 1px solid #999; border-top: 0px; background-color: #eee;">
+	<table border="0" width="100%" height="100%">
+		<tr>
+			<td>
+				<table border="0">
+					<tr>
+						<td>{cc_label_catalogue_type}</td>
+						<td>{cc_label_ordinance_type}</td>
+					</tr>
+					<tr>
+						<td><select id="cc_email_win_catalogues" style="width: 200px;" onchange="javascript:catalogue_change();"><option>{cc_choose_catalogue}</option></select></td>
+						<td><select id="cc_email_win_ordinances" style="width: 200px;" onchange="javascript:ordinance_change();"><option>{cc_choose_ordinance}</option></select></td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<table border="0" width="100%">
+					<tr>
+						<td valign="top">
+							<table border="0">
+								<tr>
+									<td>{cc_label_contacts}</td>
+								</tr>
+								<tr>
+									<td><select id="cc_email_win_contacts" style="width: 200px; height: 230px; overflow: auto;" multiple></select></td>
+								</tr>
+							</table>
+						</td>
+						<td valign="top">
+							<table border="0" width="100%" height="100%">
+								<tr>
+									<td></td>
+									<td>{cc_label_to}</td>
+								</tr>
+								<tr>
+									<td align="center" valign="middle">
+										<table border="0">
+											<tr><td><input style="width: 60px;" type="button" value="{cc_btn_to_add}" onclick="javascript:contacts_to_to();"></td></tr>
+											<tr><td><input style="width: 60px;" type="button" value="{cc_btn_to_del}" onclick="javascript:contacts_to_to();"></td></tr>
+										</table>
+									</td>
+									<td><select id="cc_email_win_to" style="width: 200px; height: 60px;" multiple></select></td>
+								</tr>
+								<tr>
+									<td></td>
+									<td>{cc_label_cc}</td>
+								</tr>
+								<tr>
+									<td align="center">
+										<table valign="middle" border="0">
+											<tr><td><input style="width: 60px;" type="button" value="{cc_btn_cc_add}" onclick="javascript:contacts_to_cc();"></td></tr>
+											<tr><td><input style="width: 60px;" type="button" value="{cc_btn_cc_del}" onclick="javascript:contacts_to_cc();"></td></tr>
+										</table>
+									</td>
+									<td><select id="cc_email_win_cc" style="width: 200px; height: 60px;" multiple></select></td>
+								</tr>
+								<tr>
+									<td></td>
+									<td>{cc_label_cco}</td>
+								</tr>
+								<tr>
+									<td align="center" valign="middle">
+										<table border="0">
+											<tr><td><input style="width: 60px;" type="button" value="{cc_btn_cco_add}" onclick="javascript:contacts_to_cco();"></td></tr>
+											<tr><td><input style="width: 60px;" type="button" value="{cc_btn_cco_del}" onclick="javascript:contacts_to_cco();"></td></tr>
+										</table>
+									</td>
+									<td><select id="cc_email_win_cco" style="width: 200px; height: 60px;" multiple></select></td>
+								</tr>								
+							</table>
+						</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<table width="100%" border="0">
+					<tr align="center">
+						<td width="10%"><input style="width: 70px;" type="button" value="{cc_btn_search}" onclick="javascript:search();"></td>
+						<td width="10%"><input style="width: 70px;" type="button" value="{cc_btn_new}" onclick="javascript:new_contact();"></td>
+						<td width="10%"><input style="width: 70px;" type="button" value="{cc_btn_details}" onclick="javascript:details();"></td>
+						<td width="50%">&nbsp;</td>
+						<td width="10%"><input style="width: 70px;" type="button" value="{cc_btn_ok}" onclick="javascript:ok();"></td>
+						<td width="10%"><input style="width: 70px;" type="button" value="{cc_btn_cancel}" onclick="javascript:cancel();"></td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
+</div>
+
+<div id="cc_email_win_shadow" style="position: absolute; width: 500px; height: 420px; visibility: hidden; z-index: 0; background-color: #666;">
+
+<!-- BOTTOM DETAILS-->
+<script type="text/javascript">
+  	SET_DHTML(	'cc_email_win'+NO_DRAG,
+				'cc_email_win_shadow'+NO_DRAG,
+				'cc_email_win_title'+CURSOR_MOVE);
+			
+	dd.elements.cc_email_win_title.addChild(dd.elements.cc_email_win);
+	dd.elements.cc_email_win_title.addChild(dd.elements.cc_email_win_shadow);
+
+	dd.elements.cc_email_win_title.moveTo(0,0);
+	dd.elements.cc_email_win.moveTo(0,20);
+	dd.elements.cc_email_win_shadow.moveTo(5,5);
+	dd.elements.cc_email_win_title.moveTo(window.innerWidth/2 - dd.elements.cc_email_win_title.w/2, window.innerHeight/2 - dd.elements.cc_email_win.h/2);
+
+	dd.elements.cc_email_win.setZ(2);
+	dd.elements.cc_email_win_title.setZ(2);
+	dd.elements.cc_email_win_shadow.setZ(1);
+
+	dd.elements.cc_email_win_title.show();
+</script>
+<!-- END BOTTOM DETAILS-->
Index: /branches/2.0/preferences/templates/classic/preference_acl_row.tpl
===================================================================
--- /branches/2.0/preferences/templates/classic/preference_acl_row.tpl	(revision 1196)
+++ /branches/2.0/preferences/templates/classic/preference_acl_row.tpl	(revision 1196)
@@ -0,0 +1,2 @@
+   <option value="{id}">{user}</option>
+	
Index: /branches/2.0/preferences/templates/classic/listUsers.php
===================================================================
--- /branches/2.0/preferences/templates/classic/listUsers.php	(revision 1196)
+++ /branches/2.0/preferences/templates/classic/listUsers.php	(revision 1196)
@@ -0,0 +1,142 @@
+<?php			
+	
+	$GLOBALS['phpgw_info']['flags'] = array(
+		'noheader' => True,
+		'nonavbar' => True,
+		'currentapp' => 'preferences'		
+	);
+	
+	include('../../../header.inc.php');
+	include('../../../phpgwapi/templates/celepar/head.inc.php');
+	
+	$acl_app =  $_SESSION['acl_app'];
+	$owner	 =  $_SESSION['owner'];
+	
+	$GLOBALS['phpgw_info']['flags']['currentapp'] = $acl_app;
+	
+	if(!@is_object($GLOBALS['phpgw']->js))	{
+		$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
+	}
+	
+	$GLOBALS['phpgw']->js->validate_file('jscode','scripts','preferences');
+	$GLOBALS['phpgw']->common->phpgw_header();	
+	
+	
+	$t = &$GLOBALS['phpgw']->template;						
+	// seta o Template
+	$t->set_file(array('addUser_t' => '../../../preferences/templates/celepar/listUsers.tpl'));
+	
+	$obj_account = CreateObject('phpgwapi.accounts',$this->bo->owner);
+
+	$post_select_organization = $_POST['select_organization'];
+	$post_select_sector = $_POST['select_sector'];
+	$change_organization = $_POST['change_organization'];
+	
+	$obj_org_sector = CreateObject('phpgwapi.sector_search_ldap');
+	if ((!$post_select_organization) && (!$post_select_sector)) //primeira vez
+	{
+		$user_org = $obj_account->get_organization($GLOBALS['phpgw_info']['user']['account_dn']);
+		$user_sector = $obj_account->get_sector($GLOBALS['phpgw_info']['user']['account_dn']);
+		$user_context = $obj_account->get_context($GLOBALS['phpgw_info']['user']['account_dn']);
+		
+		$organizations_info = $obj_org_sector->organization_search($GLOBALS['phpgw_info']['server']['ldap_context']);
+		@asort($organizations_info);
+		@reset($organizations_info);					
+		$sectors_info = $obj_org_sector->sector_search('ou='.$user_org.','.$GLOBALS['phpgw_info']['server']['ldap_context']);
+	}
+	else //mudou uma das combos
+	{
+		$user_org = $post_select_organization;
+		$user_sector = $post_select_sector;
+		if ($change_organization == "True")
+			$user_context = 'ou='.$user_org.','.$GLOBALS['phpgw_info']['server']['ldap_context'];
+		else
+			$user_context = $post_select_sector;
+		$organizations_info = $obj_org_sector->organization_search($GLOBALS['phpgw_info']['server']['ldap_context']);
+		@asort($organizations_info);
+		@reset($organizations_info);					
+		$sectors_info = $obj_org_sector->sector_search('ou='.$user_org.','.$GLOBALS['phpgw_info']['server']['ldap_context']);
+	}
+		
+	foreach($organizations_info as $organization)
+	{
+		$combo_organization .= '<option value="' . $organization . '"'; 	
+		
+		if (!$post_select_organization)
+		{
+			if($organization == $user_org)
+			{
+				$combo_organization .= ' selected';
+			}
+		}
+		else
+		{
+			if($organization == $post_select_organization)
+			{
+				$combo_organization .= ' selected';
+			}
+		}	
+		$combo_organization .= '>' .$organization.'</option>'."\n";
+	}
+	
+	$combo_sector .= '<option value="ou='.$user_org.','.$GLOBALS['phpgw_info']['server']['ldap_context'].'"> --------- </option>'."\n";
+	foreach($sectors_info as $sector)
+	{
+		$combo_sector .= '<option value="' . $sector->sector_context . '"';
+
+		if (!$post_select_sector)
+		{
+			if($sector->sector_name == $user_sector)
+				$combo_sector .= ' selected';
+		}
+		else
+		{
+			if($sector->sector_context == $post_select_sector)
+				$combo_sector .= ' selected';
+		}
+		$combo_sector .= '>' .$sector->sector_name.'</option>'."\n";
+	}			
+	
+	// Monta lista de Grupos e Usuários
+	$users = Array();
+	$groups = Array();
+
+	$ds = $GLOBALS['phpgw']->common->ldapConnect();
+    if ($ds) 
+    {
+		$sr=ldap_list($ds, $user_context, ("(&(cn=*)(phpgwaccounttype=u))"));
+		$info = ldap_get_entries($ds, $sr);
+		for ($i=0; $i<$info["count"]; $i++)
+			$users[$uids=$info[$i]["uidnumber"][0]] = Array('name'	=>	$uids=$info[$i]["cn"][0], 'type'	=>	u);
+	}
+	ldap_close($ds);
+    	
+	@asort($users);
+	@reset($users);	
+	@asort($groups);
+	@reset($groups);
+
+	$options ='';
+
+	foreach($users as $id => $user_array) {
+		if($owner != $id){
+			$newId = 'u_'.$acl_app.'['.$id;			
+			$options .= '<option  value="'.$newId.'">'.utf8_decode($user_array['name']).$array_app.'</option>'."\n";
+		}
+	}
+
+	$t->set_var ('lang_Organization',lang('Organization'));
+	$t->set_var ('lang_Sector',lang('Sector'));
+	$t->set_var ('lang_Calendar',lang('Calendar'));
+	$t->set_var ('lang_Add_Participants',lang('Add Participants'));
+	$t->set_var ('lang_to_Search',lang('to Search'));
+	$t->set_var ('lang_Close',lang('Close'));
+	$t->set_var ('lang_Add',lang('Add'));
+	
+	$t->set_var('options',$options);
+	$t->set_var('combo_organization', $combo_organization);
+	$t->set_var('combo_sector', $combo_sector);
+	$t->parse('out','addUser_t',true);
+	$t->p('out');
+	$GLOBALS['phpgw']->common->phpgw_exit();	
+?>
Index: /branches/2.0/preferences/templates/classic/preference_acl_hidden.tpl
===================================================================
--- /branches/2.0/preferences/templates/classic/preference_acl_hidden.tpl	(revision 1196)
+++ /branches/2.0/preferences/templates/classic/preference_acl_hidden.tpl	(revision 1196)
@@ -0,0 +1,5 @@
+<input type="hidden" name="{read}"    id='{read}'    value="Y" {read_selected}/>
+<input type="hidden" name="{add}"     id='{add}'     value="Y" {add_selected}/>
+<input type="hidden" name="{edit}"    id='{edit}'    value="Y" {edit_selected}/>
+<input type="hidden" name="{delete}"  id='{delete}'  value="Y" {delete_selected}/>
+<input type="hidden" name="{private}" id='{private}' value="Y" {private_selected}/>   
Index: /branches/2.0/preferences/templates/classic/listUsers.tpl
===================================================================
--- /branches/2.0/preferences/templates/classic/listUsers.tpl	(revision 1196)
+++ /branches/2.0/preferences/templates/classic/listUsers.tpl	(revision 1196)
@@ -0,0 +1,59 @@
+<html>
+	<head>
+		<title>{lang_Add_Participants}</title>
+	</head>
+	<body>
+		<form name="formAddUser" method="POST">	
+		 <center>	
+		  <table cellspacing="3" cellpadding="3">														
+		   <tr>
+			 <td>
+			  <div id="divAppboxHeader">{lang_Add_Participants}</div>
+			  <div id="divAppbox">
+			   <table border=0>
+				<tr><td>{lang_Organization}:</td></tr>
+				<tr><td><select name="select_organization" onchange="formAddUser.change_organization.value='True';formAddUser.submit()">.{combo_organization}.</select></td></tr>
+				<tr><td>{lang_Sector}:</td></tr>
+				<tr><td><select name="select_sector" onchange="formAddUser.submit()">.{combo_sector}.</select></td></tr>
+				<input type="hidden" name="change_organization" value="False">
+				<tr>
+				 <td>
+				  <select name="user_values" multiple style="width:250px" size="18" id="user_list_in">
+				  {options}
+				  </select>					
+				 </td>
+			    </tr>
+				<tr><td>&nbsp;</td>	</tr>
+				<tr>
+				 <td>   			
+				  <center>{lang_to_Search}:&nbsp;<input type="text" name="query" onkeyup="optionFinder(this)"></center>   			
+				 </td>
+				</tr>				
+				<tr><td>&nbsp;</td>	</tr>
+				<tr>
+				 <td>
+				  <center>
+				   <input type="button" class="button" value="Adicionar e Retornar" onClick="javascript:adicionaLista()">
+				   <input type="button" value="Cancelar" onClick="javascript:window.close()">
+				  </center>
+				 </td>
+				</tr>		
+			   </table>
+			  </div>
+			 </td>	
+			</tr>
+		   </table>
+		  </center>				
+		 </form>
+	</body>
+</html>
+<script language="Javascript1.3">
+//Variaveis Locais 
+ var select = document.getElementById('user_list_in');
+ var users = new Array();
+ //Inicializacao			
+ for(var i = 0; i < select.options.length; i++) {				
+	 option = new Option(select.options[i].text,select.options[i].value);	 
+	 users[i] = option;	 				
+ }					
+</script>
Index: /branches/2.0/preferences/templates/classic/preference_acl.tpl
===================================================================
--- /branches/2.0/preferences/templates/classic/preference_acl.tpl	(revision 1196)
+++ /branches/2.0/preferences/templates/classic/preference_acl.tpl	(revision 1196)
@@ -0,0 +1,80 @@
+{errors}
+{title}
+<script src='phpgwapi/templates/celepar/js/listUsers.js' type='text/javascript'></script>
+<form method="POST" action="{action_url}" name="formAcl">
+<center>
+<table border="0"
+	<tr>
+		<td width="10%"></td>
+		<td  width="55%"><center><strong>Lista de Usu&aacute;rios</strong></center></td>		
+		<td  width="35%">
+			<strong>Atributos</strong>
+		</td>
+	</tr>
+	
+	<tr>
+		<td></td>
+		<td>
+			<center>
+				<select id="user_list" name="user_values" style="width:250px" size="10" onChange="javascript:execAction('LOAD')" onClick="javascript:execAction('LOAD')">{row}</select>
+			</center>
+		</td>			
+		<td valign = 'top'> 
+			<table border="0">
+				<tr>
+					<td><input type="checkbox" name="checkAttr" value="Y" onclick="javascript:execAction('SAVE')"></td>
+					<td>Ler</td>
+				</tr>
+				<tr {add_invisible}>
+					<td><input type="checkbox" name="checkAttr" value="Y" onclick="javascript:execAction('SAVE')"></td>
+					<td>Adicionar</td>
+				</tr>
+				<tr>													
+					<td><input type="checkbox" name="checkAttr" value="Y" onclick="javascript:execAction('SAVE')"></td>
+					<td>Editar</td>				
+				</tr>
+				<tr>					
+					<td><input type="checkbox" name="checkAttr" value="Y" onclick="javascript:execAction('SAVE')"></td>
+					<td>Excluir</td>
+				</tr>
+				
+				<tr {private_invisible}>
+					<td><input type="checkbox" name="checkAttr" value="Y" onclick="javascript:execAction('SAVE')"></td>
+					<td>Restritos</td>
+				</tr>
+				
+			</table>
+			
+		</td>
+	</tr>
+	
+	<tr>
+		<td></td>
+		<td width="40%" id="tdHiddens">
+			&nbsp;
+		</td>
+	</tr>
+	<tr>
+		<td></td>
+	<td>
+		{common_hidden_vars_form}
+		{hiddens}
+ 			<input type="hidden" name="processed" value="{processed}">
+ 		<center>
+ 			<input type="submit" name="submit" value="{submit_lang}">
+			<input type="button" value="Adicionar" onclick="openListUsers(340,533,'preferences')">
+			<input type="button" value="Remover" onclick="javascript:remUserAcl()">
+			<input type="button" value="Cancelar" onclick="javascript:history.back()">
+ 		</center>
+	</td>
+	</tr>
+	
+</table>
+</center>
+</form>
+<script language="Javascript1.3">
+if(!document.formAcl.user_values.length)
+	for(j = 0; j < document.formAcl.checkAttr.length; j++)
+		document.formAcl.checkAttr[j].disabled = true;
+
+</script>
Index: /branches/2.0/calendar/templates/classic/month_day.tpl
===================================================================
--- /branches/2.0/calendar/templates/classic/month_day.tpl	(revision 1196)
+++ /branches/2.0/calendar/templates/classic/month_day.tpl	(revision 1196)
@@ -0,0 +1,21 @@
+
+<!-- BEGIN m_w_table -->
+
+<table id="calendar_m_w_table" class="calendar_m_w_table" border="0" width="100%">
+	<! from month_header.tpl -->
+	{row}
+</table>
+<!-- END m_w_table -->
+
+<!-- BEGIN month_daily -->
+<span class="screen_only">[ </span><span class="calendar_m_w_table_daynumber" >{day_number}</span><span class="screen_only"> ]</span>{new_event_link}<br />
+    {daily_events}
+<!-- END month_daily -->
+
+<!-- BEGIN day_event -->
+{events}
+<!-- END day_event -->
+
+<!-- BEGIN event -->
+{day_events}
+<!-- END event -->
Index: /branches/2.0/calendar/templates/classic/app_print.css
===================================================================
--- /branches/2.0/calendar/templates/classic/app_print.css	(revision 1196)
+++ /branches/2.0/calendar/templates/classic/app_print.css	(revision 1196)
@@ -0,0 +1,294 @@
+/* Este documento é um css somente para impressão do calendário no papel!
+O seu efeito não aparece na tela  */
+
+.calendar_print_main {
+	text-align:center;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 8px;
+	color: #000066;
+	background-color: #F7F7F7;
+	border: 1px solid #CCCCCC;
+	margin: 5px;
+	padding: 5px;
+	height: 700px;
+	width: 600px;
+}
+.button {
+	display: none;
+}
+
+
+.to_continue
+{
+	font-size: 9px;
+}
+
+A.minicalendar 
+{ 
+	color: #000000; 
+	font-size: 9px;
+	
+}
+
+A.bminicalendar 
+{ 
+	color: #336699; 
+	font-style: italic;
+	font-weight: bold;
+	font-size: 9px; 
+}
+
+A.minicalendargrey 
+{ 
+	color: #999999; 
+	font-size: 10px;
+	font-weight: bold;
+}
+
+A.bminicalendargrey 
+{ 
+	color: #336699; 
+	font-style: italic; 
+	font-size:10px; 
+}
+
+A.minicalhol
+{ 
+	padding-left:3px;
+	padding-right:3px;
+	background: #dab0b0;
+	color: #000000; 
+	font-size: 10px; 
+}
+
+A.bminicalhol
+{ 
+	padding-left:3px;
+	padding-right:3px;
+	background: #dab0b0;
+	color: #336699; 
+	font-size: 10px; 
+}
+
+A.minicalgreyhol
+{ 
+	padding-left:3px;
+	padding-right:3px;
+	background: #dab0b0;
+	color: #999999; 
+	font-size: 10px; 
+}
+
+A.bminicalgreyhol
+{ 
+	padding-left:3px;
+	padding-right:3px;
+	background: #dab0b0;
+	color: #999999; 
+	font-size: 10px; 
+}
+
+
+.event-on
+{ 
+	background: #D3DCE3;
+	border: #E8F0F0 1px solid;
+}
+
+.event-off
+{ 
+	background: #E8F0F0;
+	border: #D3DCE3 1px solid;
+}
+
+.event-holiday
+{
+	font-size: 100%;
+	background: #dac0c0;
+	color:#000000;
+	vertical-align: middle;
+}
+
+.time
+{
+	background: #D3DCE3;
+	color:#000000;
+	font-size: 10px;
+	font-weight: bold;
+	vertical-align: middle;
+	width: 5.2%;
+	text-align: right;
+	padding-right: 5px;
+	line-height: 11px;
+	border: #E8F0F0 1px solid;
+}
+
+
+.planner-cell
+{
+	cursor: pointer;
+	cursor: hand;
+	border: thin solid black;
+}
+
+/* common */
+.calendar_link_print
+{
+	text-align: center;
+	font-size: 10px;
+}
+
+//Mini Calendar
+
+.calendar_minical_table
+{
+	width: 180px;
+	font-weight: bold;
+}
+
+.calendar_minical_daytable
+{
+	width: 100%;
+}
+
+.calendar_minical_dayname
+{
+	font-size: 9px;
+	text-align: right;
+}
+
+.calendar_minical_hrule
+{
+	width: 96%;
+}
+
+/* Header */
+.calendar_dropbuttons
+{
+	align: center;
+	text-align: center;
+	vertical-align: bottom;
+	font-weight: bold;
+	font-size: 8px;
+}
+
+.calendar-weekidentifier
+{
+	font-size:16px;
+	font-weight: bold;
+	text-align: center;
+}
+
+.calendar_header
+{
+	font-size: 16px;
+	font-weight: bold;
+	text-align: center;
+}
+
+.calendar_dayview_table_header
+{
+	font-size: 13px;
+	font-weight: bold;
+	text-align: center;
+}
+
+.calendar_dayview_todo_header
+{
+	margin: 0px; 
+	padding: 2px;
+	font-weight: bold;
+}
+
+/* week view */
+.calendar_week_identifier_table
+{
+	border: 0px solid black;
+	width: 100%;
+}
+
+.calendar_week_identifier
+{
+	font-size: 13px;
+	text-align: center;
+	font-weight: bold;
+}
+
+.calendar_weekview_daytitle
+{
+	font-weight: bold;
+	font-size: 12px;
+	background: #D3DCE3;
+}
+
+.calendar_m_w_table
+{
+	table-layout:fixed;
+	overflow:hidden;
+	height: 90%;
+	width: 100%;
+	border: 0px #000000 solid;
+}
+
+.calendar_m_w_tablecell
+{
+	overflow:hidden;
+	vertical-align: top;
+	padding-left: 4px;
+	padding-right: 4px;
+	padding-bottom: 6px;
+	border: 1px solid #000000;
+}
+
+.screen_only
+{
+	display:none;
+}
+
+.calendar_m_w_table_daynumber
+{
+	font-weight: bold;
+	font-family: Arial;
+	font-size: 10px;
+	vertical-align: top;
+	background-color: #778899;
+	border: 1px solid #000000;
+	margin: 1px;
+	padding: 1px;
+}
+
+A.event_entry
+{
+	font-size:10px;
+}
+
+/* month view */
+
+.calendar_month_identifier
+{
+	font-size:18px;
+	font-weight: bold;
+}
+
+.calendar_user_identifier
+{
+	font-size:12px;
+	color: #009999;
+	font-weight: bold;
+}
+
+.calendar_week_minical_table
+{
+	width:100%;
+	border: 0px solid #000000
+}
+
+.calendar_weekinfo
+{
+	color: #000000;
+	padding-left: 2px;
+	padding-right: 2px;
+	font-size: 10px;
+	font-weight: bold;
+	font-style: italic;
+}
Index: /branches/2.0/calendar/templates/classic/edit.tpl
===================================================================
--- /branches/2.0/calendar/templates/classic/edit.tpl	(revision 1196)
+++ /branches/2.0/calendar/templates/classic/edit.tpl	(revision 1196)
@@ -0,0 +1,61 @@
+<!-- BEGIN edit_entry -->
+<style type="text/css">
+div#tipDiv {
+  position:absolute; visibility:hidden; left:0; top:0; z-index:10000;
+  background-color:#EFEFEF; border:1px solid #337;
+  width:220px; padding:3px;
+  color:#000; font-size:11px; line-height:1.2;
+  cursor: default;
+}
+</style>
+<script language="JavaScript">
+	self.name="first_Window";
+	function accounts_popup()
+	{
+		Window1=window.open('{accounts_link}',"Search","width=800,height=600,toolbar=no,scrollbars=yes,resizable=yes");
+	}
+</script>
+<center>
+<font color="#000000" face="{font}">
+
+<form action="{action_url}" method="post" name="app_form">
+{common_hidden}
+<table id="editFormTable" border="0" width="90%">
+ <tr>
+  <td colspan="2">
+   <center><font size="+1"><b id="formStatus">{errormsg}</b></font></center>
+  </td>
+ </tr>
+{row}
+ <tr>
+  <td>
+  <table><tr valign="top">
+  <td>
+  <div style="padding-top:15px; padding-right: 2px">
+  	<script language="JavaScript">
+		var alert_field = '{alert_msg}';
+	</script>
+  	<input id="submit_button" style="font-size:10px" type="submit" value="{submit_button}" onClick="return submitValues(alert_field);"></div></form>
+  </td>
+  <td>{cancel_button}</td>
+  </tr></table>
+  </td>
+  <td align="right">{delete_button}</td>
+ </tr>
+</table>
+</font>
+</center>
+<!-- END edit_entry -->
+<!-- BEGIN list -->
+ <tr bgcolor="{tr_color}">
+  <td valign="top" width="25%">&nbsp;<b>{field}:</b></td>
+  <td valign="top" width="75%">{data}</td>
+ </tr>
+<!-- END list -->
+<!-- BEGIN hr -->
+ <tr bgcolor="{tr_color}">
+  <td colspan="2">
+   {hr_text}
+  </td>
+ </tr>
+<!-- END hr -->
Index: /branches/2.0/calendar/templates/classic/listUsers.php
===================================================================
--- /branches/2.0/calendar/templates/classic/listUsers.php	(revision 1196)
+++ /branches/2.0/calendar/templates/classic/listUsers.php	(revision 1196)
@@ -0,0 +1,167 @@
+<?php			
+	
+	$GLOBALS['phpgw_info']['flags'] = array(
+		'noheader' => True,
+		'nonavbar' => True,
+		'currentapp' => 'calendar'		
+	);
+	
+	include('../../../header.inc.php');
+	include('../../../phpgwapi/templates/celepar/head.inc.php');
+
+	$owner = $GLOBALS['_GET']['owner'];
+	
+	if(!@is_object($GLOBALS['phpgw']->js))	{
+		$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
+	}
+	
+	$GLOBALS['phpgw']->js->validate_file('jscode','scripts','preferences');		
+	$t = &$GLOBALS['phpgw']->template;						
+	// seta o Template
+	$t->set_file(array('addUser_t' => '../../../calendar/templates/celepar/listUsers.tpl'));
+	
+	$obj_account = CreateObject('phpgwapi.accounts',$this->bo->owner);
+
+	$post_select_organization = $_POST['select_organization'];
+	$post_select_sector = $_POST['select_sector'];
+	$change_organization = $_POST['change_organization'];
+	
+	$obj_org_sector = CreateObject('phpgwapi.sector_search_ldap');
+	if ((!$post_select_organization) && (!$post_select_sector)) //primeira vez
+	{
+		$user_org = $obj_account->get_organization($GLOBALS['phpgw_info']['user']['account_dn']);
+		$user_sector = $obj_account->get_sector($GLOBALS['phpgw_info']['user']['account_dn']);
+		$user_context = $obj_account->get_context($GLOBALS['phpgw_info']['user']['account_dn']);
+		
+		$organizations_info = $obj_org_sector->organization_search($GLOBALS['phpgw_info']['server']['ldap_context']);
+		@asort($organizations_info);
+		@reset($organizations_info);					
+		$sectors_info = $obj_org_sector->sector_search('ou='.$user_org.','.$GLOBALS['phpgw_info']['server']['ldap_context']);
+	}
+	else //mudou uma das combos
+	{
+		$user_org = $post_select_organization;
+		$user_sector = $post_select_sector;
+		if ($change_organization == "True")
+			$user_context = 'ou='.$user_org.','.$GLOBALS['phpgw_info']['server']['ldap_context'];
+		else
+			$user_context = $post_select_sector;
+		$organizations_info = $obj_org_sector->organization_search($GLOBALS['phpgw_info']['server']['ldap_context']);
+		@asort($organizations_info);
+		@reset($organizations_info);					
+		$sectors_info = $obj_org_sector->sector_search('ou='.$user_org.','.$GLOBALS['phpgw_info']['server']['ldap_context']);
+	}
+		
+	foreach($organizations_info as $organization)
+	{
+		$combo_organization .= '<option value="' . $organization . '"'; 	
+		
+		if (!$post_select_organization)
+		{
+			if(strtolower($organization) == strtolower($user_org))
+			{
+				$combo_organization .= ' selected';
+			}
+		}
+		else
+		{
+			if(strtolower($organization) == strtolower($post_select_organization))
+			{
+				$combo_organization .= ' selected';
+			}
+		}	
+		$combo_organization .= '>' .$organization.'</option>'."\n";
+	}
+	
+	$combo_sector .= '<option value="ou='.$user_org.','.$GLOBALS['phpgw_info']['server']['ldap_context'].'"> --------- </option>'."\n";
+	foreach($sectors_info as $sector)
+	{
+		if ($sector->sector_level == 1)
+		{
+			$sector->sector_name = '- '.$sector->sector_name;
+		}
+		else
+		{
+			$sector_space = '';
+			for ($i=1; $i < $sector->sector_level; $i++)
+				$sector_space = '---'.$sector_space;
+			$sector->sector_name = $sector_space.' '.$sector->sector_name;
+		}
+	
+		$combo_sector .= '<option value="' . $sector->sector_context . '"';
+
+		if (!$post_select_sector)
+		{
+			if($sector->sector_name == $user_sector)
+				$combo_sector .= ' selected';
+		}
+		else
+		{
+			if($sector->sector_context == $post_select_sector)
+				$combo_sector .= ' selected';
+		}
+		$combo_sector .= '>' .$sector->sector_name.'</option>'."\n";
+	}			
+	
+	// Monta lista de Grupos e Usuários
+	$users = Array();
+	$groups = Array();
+
+	$ds = $GLOBALS['phpgw']->common->ldapConnect();
+    if ($ds) 
+    {
+		$sr=ldap_list($ds, $user_context, ("(&(cn=*)(phpgwaccounttype=g))"));
+		$info = ldap_get_entries($ds, $sr);
+		for ($i=0; $i<$info["count"]; $i++)
+			$groups[$uids=$info[$i]["gidnumber"][0]] = Array('name'	=>	$uids=$info[$i]["cn"][0], 'type'	=>	g);
+
+		$sr=ldap_list($ds, $user_context, ("(&(cn=*)(phpgwaccounttype=u)(!(cn=lista*)))"));
+		$info = ldap_get_entries($ds, $sr);
+		for ($i=0; $i<$info["count"]; $i++)
+		{
+			if ($info[$i]["phpgwaccountvisible"][0] == '-1')
+				continue;
+			$users[$uids=$info[$i]["uidnumber"][0]] = Array('name'	=>	$uids=$info[$i]["cn"][0], 'type'	=>	u);
+		}
+	}
+	ldap_close($ds);
+    	
+	@asort($users);
+	@reset($users);	
+	@asort($groups);
+	@reset($groups);
+
+	$options ='';
+	if(count($groups))
+		$options .= '<option  value="-1" disabled>--------------------&nbsp;&nbsp;&nbsp;&nbsp;Grupos&nbsp;&nbsp;&nbsp;&nbsp;------------------- </option>'."\n";
+		
+	foreach($groups as $id => $user_array) {
+			$newId = $id.'U';
+			$options .= '<option  value="'.$newId.'">'.utf8_decode($user_array['name']).$array_app.'</option>'."\n";
+	}
+	
+	if(count($users))
+		$options .= '<option  value="-1" disabled>-------------------&nbsp;&nbsp;&nbsp;&nbsp;Usuários&nbsp;&nbsp;&nbsp;&nbsp;------------------ </option>'."\n";
+	
+	foreach($users as $id => $user_array) {
+		if($owner != $id){
+			$newId = $id.'U';
+			$options .= '<option  value="'.$newId.'">'.utf8_decode($user_array['name']).$array_app.'</option>'."\n";
+		}
+	}
+
+	$t->set_var ('lang_Organization',lang('Organization'));
+	$t->set_var ('lang_Sector',lang('Sector'));
+	$t->set_var ('lang_Calendar',lang('Calendar'));
+	$t->set_var ('lang_Add_Participants',lang('Add Participants'));
+	$t->set_var ('lang_to_Search',lang('to Search'));
+	$t->set_var ('lang_Close',lang('Close'));
+	$t->set_var ('lang_Add',lang('Add'));
+	
+	$t->set_var('options',$options);
+	$t->set_var('combo_organization', $combo_organization);
+	$t->set_var('combo_sector', $combo_sector);
+	$t->parse('out','addUser_t',true);
+	$t->p('out');
+	$GLOBALS['phpgw']->common->phpgw_exit();	
+?>
Index: /branches/2.0/calendar/templates/classic/header.inc.php
===================================================================
--- /branches/2.0/calendar/templates/classic/header.inc.php	(revision 1196)
+++ /branches/2.0/calendar/templates/classic/header.inc.php	(revision 1196)
@@ -0,0 +1,229 @@
+<?php
+  /**************************************************************************\
+  * eGroupWare                                                               *
+  * http://www.egroupware.org                                                *
+  * --------------------------------------------                             *
+  *  This program is free software; you can redistribute it and/or modify it *
+  *  under the terms of the GNU General Public License as published by the   *
+  *  Free Software Foundation; either version 2 of the License, or (at your  *
+  *  option) any later version.                                              *
+  \**************************************************************************/
+
+
+	function add_col(&$tpl,$str)
+	{
+		$tpl->set_var('str',$str);
+		$tpl->parse('header_column','head_col',True);
+	}
+
+	function add_image_ahref($link,$image,$alt)
+	{
+		return '<a href="'.$link.'"><img src="'.$GLOBALS['phpgw']->common->image('calendar',$image).'" alt="'.$alt.'" title="'.$alt.'" border="0"></a>';
+	}
+
+	$refer = explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
+	$referrer = $refer[2];
+
+	$templates = Array(
+		'head_tpl'	=> 'head.tpl',
+		'form_button_dropdown'	=> 'form_button_dropdown.tpl',
+		'form_button_script'	=> 'form_button_script.tpl'
+	);
+	$tpl->set_file($templates);
+	$tpl->set_block('head_tpl','head','head');
+	$tpl->set_block('head_tpl','head_table','head_table');
+	$tpl->set_block('head_tpl','head_col','head_col');
+	$tpl->set_block('form_button_script','form_button');
+
+	if(floor(phpversion()) >= 4)
+	{
+		$tpl->set_var('cols',8);
+	}
+	else
+	{
+		$tpl->set_var('cols',7);
+	}
+
+	$today = date('Ymd',$GLOBALS['phpgw']->datetime->users_localtime);
+
+	$col_width = 12;
+
+	add_col($tpl,'  <td width="2%">&nbsp;</td>');
+
+	add_col($tpl,'  <td width="2%">'.add_image_ahref($this->page('day','&date='.$today),'today',lang('Today')).'</td>');
+
+	add_col($tpl,'  <td width="2%" align="left">'.add_image_ahref($this->page('week','&date='.$today),'week',lang('This week')).'</td>');
+
+	add_col($tpl,'  <td width="2%" align="left">'.add_image_ahref($this->page('month','&date='.$today),'month',lang('This month')).'</td>');
+
+	add_col($tpl,'  <td width="2%" align="left">'.add_image_ahref($this->page('year','&date='.$today),'year',lang('This Year')).'</td>');
+
+	if(floor(phpversion()) >= 4)
+	{
+		add_col($tpl,'  <td width="2%" align="left">'.add_image_ahref($this->page('planner','&date='.$today),'planner',lang('Planner')).'</td>');
+		$col_width += 2;
+	}
+
+	//add_col($tpl,'  <td width="2%" align="left">'.add_image_ahref($this->page('matrixselect'),'view',lang('Daily Matrix View')).'</td>');
+
+	add_col($tpl,'  <td width="'.(100 - $col_width).'%" align="left"'.(floor(phpversion()) < 4?' colspan="2"':'').'>&nbsp;</td>');
+
+	$tpl->parse('row','head_table',True);
+
+	$tpl->set_var('header_column','');
+	$tpl->set_var('cols',$cols);
+
+	if($referrer!='view')
+	{
+		$remainder = 72;
+		
+		$date = (isset($GLOBALS['date'])?$GLOBALS['date']:'');
+		$date = (isset($GLOBALS['HTTP_GET_VARS']['date'])?$GLOBALS['HTTP_GET_VARS']['date']:$date);
+		$date = ($date=='' && isset($GLOBALS['HTTP_POST_VARS']['date'])?$GLOBALS['HTTP_POST_VARS']['date']:$date);
+
+		$base_hidden_vars = '<input type="hidden" name="from" value="'.$GLOBALS['HTTP_GET_VARS']['menuaction'].'">'."\n";
+		if(isset($GLOBALS['HTTP_GET_VARS']['cal_id']) && $GLOBALS['HTTP_GET_VARS']['cal_id'] != 0)
+		{
+			$base_hidden_vars .= '    <input type="hidden" name="cal_id" value="'.$GLOBALS['HTTP_GET_VARS']['cal_id'].'">'."\n";
+		}
+		if(isset($GLOBALS['HTTP_POST_VARS']['keywords']) && $GLOBALS['HTTP_POST_VARS']['keywords'])
+		{
+			$base_hidden_vars .= '    <input type="hidden" name="keywords" value="'.$GLOBALS['HTTP_POST_VARS']['keywords'].'">'."\n";
+		}
+		if(isset($GLOBALS['HTTP_POST_VARS']['matrixtype']) && $GLOBALS['HTTP_POST_VARS']['matrixtype'])
+		{
+			$base_hidden_vars .= '    <input type="hidden" name="matrixtype" value="'.$GLOBALS['HTTP_POST_VARS']['matrixtype'].'">'."\n";
+		}
+		if($date)
+		{
+			$base_hidden_vars .= '    <input type="hidden" name="date" value="'.$date.'">'."\n";
+		}
+		$base_hidden_vars .= '    <input type="hidden" name="month" value="'.$this->bo->month.'">'."\n";
+		$base_hidden_vars .= '    <input type="hidden" name="day" value="'.$this->bo->day.'">'."\n";
+		$base_hidden_vars .= '    <input type="hidden" name="year" value="'.$this->bo->year.'">'."\n";
+		
+		if(isset($GLOBALS['HTTP_POST_VARS']['participants']) && $GLOBALS['HTTP_POST_VARS']['participants'])
+		{
+			for ($i=0;$i<count($GLOBALS['HTTP_POST_VARS']['participants']);$i++)
+			{
+				$base_hidden_vars .= '    <input type="hidden" name="participants[]" value="'.$GLOBALS['HTTP_POST_VARS']['participants'][$i].'">'."\n";
+			}
+		}
+
+		$var = Array(
+			'form_width' => '28',
+			'form_link'	=> $this->page($referrer),
+			'form_name'	=> 'cat_id',
+			'title'	=> lang('Category'),
+			'hidden_vars'	=> $base_hidden_vars,
+			'form_options'	=> '<option value="0">'.lang('All').'</option>'.$this->cat->formated_list('select','all',$this->bo->cat_id,'True'),
+			'button_value'	=> lang('Go!')
+		);
+		$tpl->set_var($var);
+		$tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
+		$tpl->parse('header_column','head_col',True);
+
+		if($GLOBALS['HTTP_GET_VARS']['menuaction'] == 'calendar.uicalendar.planner')
+		{
+			$remainder -= 28;
+			print_debug('Sort By',$this->bo->sortby);
+
+			$form_options = '<option value="user"'.($this->bo->sortby=='user'?' selected':'').'>'.lang('User').'</option>'."\n";
+			$form_options .= '     <option value="category"'.((!isset($this->bo->sortby) || !$this->bo->sortby) || $this->bo->sortby=='category'?' selected':'').'>'.lang('Category').'</option>'."\n";
+		
+			$var = Array(
+				'form_width' => '28',
+				'form_link'	=> $this->page($referrer),
+				'form_name'	=> 'sortby',
+				'title'	=> lang('Sort By'),
+				'hidden_vars'	=> $base_hidden_vars,
+				'form_options'	=> $form_options,
+				'button_value'	=> lang('Go!')
+			);
+			$tpl->set_var($var);
+			$tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
+			$tpl->parse('header_column','head_col',True);
+		}
+
+		if($this->bo->check_perms(PHPGW_ACL_PRIVATE))
+		{
+			$remainder -= 28;
+			$form_options = '<option value=" all "'.($this->bo->filter==' all '?' selected':'').'>'.lang('All').'</option>'."\n";
+			$form_options .= '     <option value=" private "'.((!isset($this->bo->filter) || !$this->bo->filter) || $this->bo->filter==' private '?' selected':'').'>'.lang('Private Only').'</option>'."\n";
+		
+			$var = Array(
+				'form_width' => '28',
+				'form_link'	=> $this->page($referrer),
+				'form_name'	=> 'filter',
+				'title'	=> lang('Filter'),
+				'hidden_vars'	=> $base_hidden_vars,
+				'form_options'	=> $form_options,
+				'button_value'	=> lang('Go!')
+			);
+			$tpl->set_var($var);
+			$tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
+			$tpl->parse('header_column','head_col',True);
+		}
+//aqui !!
+
+		if((!isset($GLOBALS['phpgw_info']['server']['deny_user_grants_access']) || !$GLOBALS['phpgw_info']['server']['deny_user_grants_access']) && count($this->bo->grants) > 0)
+		{
+			$form_options = '';
+			
+			$drop_down = $this->bo->list_cals(); //hehe
+			
+			foreach($drop_down as $key => $grant)
+			{					
+				if(!strstr(($grant['value']),'g_')) 
+					$form_options .= '    <option value="'.$grant['value'].'"'.($grant['grantor']==$this->bo->owner?' selected':'').'>'.$grant['name'].'</option>'."\n";
+			}
+		
+			$var = Array(
+				'form_width' => $remainder,
+				'form_link'	=> $this->page($referrer),
+				'form_name'	=> 'owner',
+				'title'	=> lang('User'),
+				'hidden_vars'	=> $base_hidden_vars,
+				'form_options'	=> $form_options,
+				'button_value'	=> lang('Go!')
+			);
+			$tpl->set_var($var);
+			$tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
+			$tpl->parse('header_column','head_col',True);
+		}
+	}
+
+	$hidden_vars = '    <input type="hidden" name="from" value="'.$GLOBALS['HTTP_GET_VARS']['menuaction'].'">'."\n";
+	if(isset($GLOBALS['HTTP_GET_VARS']['date']) && $GLOBALS['HTTP_GET_VARS']['date'])
+	{
+		$hidden_vars .= '    <input type="hidden" name="date" value="'.$GLOBALS['HTTP_GET_VARS']['date'].'">'."\n";
+	}
+	$hidden_vars .= '    <input type="hidden" name="month" value="'.$this->bo->month.'">'."\n";
+	$hidden_vars .= '    <input type="hidden" name="day" value="'.$this->bo->day.'">'."\n";
+	$hidden_vars .= '    <input type="hidden" name="year" value="'.$this->bo->year.'">'."\n";
+	if(isset($this->bo->filter) && $this->bo->filter)
+	{
+		$hidden_vars .= '    <input type="hidden" name="filter" value="'.$this->bo->filter.'">'."\n";
+	}
+	if(isset($this->bo->sortby) && $this->bo->sortby)
+	{
+		$hidden_vars .= '    <input type="hidden" name="sortby" value="'.$this->bo->sortby.'">'."\n";
+	}
+	if(isset($this->bo->num_months) && $this->bo->num_months)
+	{
+		$hidden_vars .= '    <input type="hidden" name="num_months" value="'.$this->bo->num_months.'">'."\n";
+	}
+	$hidden_vars .= '    <input name="keywords"'.($GLOBALS['HTTP_POST_VARS']['keywords']?' value="'.$GLOBALS['HTTP_POST_VARS']['keywords'].'"':'').'>';
+
+	$var = Array(
+		'action_url_button'	=> $this->page('search'),
+		'action_text_button'	=> lang('Search'),
+		'action_confirm_button'	=> '',
+		'action_extra_field'	=> $hidden_vars
+	);
+	$tpl->set_var($var);
+	$button = $tpl->fp('out','form_button');
+	$tpl->set_var('str','<td align="right" valign="bottom">'.$button.'</td>');
+	$tpl->parse('header_column','head_col',True);
+	$tpl->parse('row','head_table',True);
+?>
Index: /branches/2.0/calendar/templates/classic/week.tpl
===================================================================
--- /branches/2.0/calendar/templates/classic/week.tpl	(revision 1196)
+++ /branches/2.0/calendar/templates/classic/week.tpl	(revision 1196)
@@ -0,0 +1,3 @@
+{week_display}
+<!-- from month_day.tpl -->
+<p align="center">{printer_friendly}</p>
Index: /branches/2.0/calendar/templates/classic/month_header.tpl
===================================================================
--- /branches/2.0/calendar/templates/classic/month_header.tpl	(revision 1196)
+++ /branches/2.0/calendar/templates/classic/month_header.tpl	(revision 1196)
@@ -0,0 +1,12 @@
+<!-- BEGIN monthly_header -->
+<tr class="calendar_m_w_table_header" colspan="{cols}" width="{col_width}%">
+{column_header}</tr>
+<!-- END monthly_header -->
+
+<!-- BEGIN column_title -->
+<th bGCOLOR="#D3DCE3" width="14.28%">{col_title}</th>
+<!-- END column_title -->
+
+<!-- BEGIN month_column -->
+<td class="calendar_m_w_tablecell" colspan="1" width="{col_width}%"{extra}>{column_data}</td>
+<!-- END month_column -->
Index: /branches/2.0/calendar/templates/classic/confirm.tpl
===================================================================
--- /branches/2.0/calendar/templates/classic/confirm.tpl	(revision 1196)
+++ /branches/2.0/calendar/templates/classic/confirm.tpl	(revision 1196)
@@ -0,0 +1,31 @@
+<!-- BEGIN list -->
+<html>
+<head>
+<title> .: Expresso :. </title>
+<link href='/phpgwapi/templates/celepar/login.css' rel='stylesheet' type='text/css'>
+</head>
+<body class='body'>
+<br>
+<center>
+<table border='0' cellpading='0' cellspacing='0'>
+	<tr>
+		<td class='td'><b><font face='Verdana, Arial, Helvetica, sans-serif'>{notify_message}</font></b></td>
+	</tr>
+	<tr>
+</table>
+</center>
+<br>
+<center>
+<table border='0' cellpading='0' cellspacing='0'>
+<tr>
+	<td>
+		<form>
+		<input type='submit' value='Ok' onclick='javascript:window.close()'>
+		</form>
+	</td>
+</tr>
+</table>
+</center>
+</body>
+</html>
+<!-- END list -->
Index: /branches/2.0/calendar/templates/classic/listUsers.tpl
===================================================================
--- /branches/2.0/calendar/templates/classic/listUsers.tpl	(revision 1196)
+++ /branches/2.0/calendar/templates/classic/listUsers.tpl	(revision 1196)
@@ -0,0 +1,50 @@
+<html>
+	<head>
+		<title>{lang_Add_Participants}</title>
+	</head>
+	<body>
+		<form name="formAddUser" method="POST">	
+		 <center>	
+		  <table cellspacing="3" cellpadding="3">														
+		   <tr>
+			 <td>
+			  <div id="divAppboxHeader">{lang_Add_Participants}</div>
+			  <div id="divAppbox">
+			   <table border=0>
+				<tr><td>{lang_Organization}:</td></tr>
+				<tr><td><select name="select_organization" onchange="formAddUser.change_organization.value='True';formAddUser.submit()">.{combo_organization}.</select></td></tr>
+				<tr><td>{lang_Sector}:</td></tr>
+				<tr><td><select name="select_sector" onchange="formAddUser.submit()">.{combo_sector}.</select></td></tr>
+				<input type="hidden" name="change_organization" value="False">
+				<tr>
+				 <td>
+				  <select name="user_values" multiple style="width:250px" size="18" id="user_list_in">
+				  {options}
+				  </select>					
+				 </td>
+			    </tr>
+			    <tr><td align ="center"><font color="red"><span id="wait">&nbsp;</span></font></td></tr>				
+				<tr>
+				 <td>   			
+				  <center><font color="blue">{lang_to_Search}:</font>&nbsp;<input type="text" id="query" autocomplete="off" name="query" onkeyup="javascript:optionFinderTimeout(this)"></center>   			
+				 </td>
+				</tr>				
+				<tr><td>&nbsp;</td>	</tr>
+				<tr>
+				 <td>
+				  <center>
+				   <input type="button" class="button" value={lang_Add} onClick="javascript:adicionaListaCalendar()">
+				   <input type="button" value={lang_Close} onClick="javascript:window.close()">
+				  </center>
+				 </td>
+				</tr>		
+			   </table>
+			  </div>
+			 </td>	
+			</tr>
+		   </table>
+		  </center>				
+		 </form>
+	</body>
+</html>
+<script src="js/edit.js" type="text/javascript"></script>
Index: /branches/2.0/calendar/templates/classic/month_day_print.tpl
===================================================================
--- /branches/2.0/calendar/templates/classic/month_day_print.tpl	(revision 1196)
+++ /branches/2.0/calendar/templates/classic/month_day_print.tpl	(revision 1196)
@@ -0,0 +1,26 @@
+
+<!-- BEGIN m_w_table -->
+
+<table id="calendar_m_w_table" class="calendar_m_w_table" border="0" width="100%">
+	<!-- from month_header.tpl -->
+	{row}
+</table>
+<!-- END m_w_table -->
+
+
+<table>
+<!-- BEGIN month_daily -->
+<tr><td style="font-size: 10px; font-weight: bold; text-decoration: underline;" width="10px">{day_number}</td>
+<td>{daily_events}</td>
+<!-- END month_daily -->
+
+<!-- BEGIN day_event -->
+
+<td>{events}</td>
+<!-- END day_event -->
+
+<!-- BEGIN event -->
+<td>{day_events}</td></tr>
+<!-- END event -->
+<br />
+</table>
Index: /branches/2.0/calendar/templates/classic/event_link.tpl
===================================================================
--- /branches/2.0/calendar/templates/classic/event_link.tpl	(revision 1196)
+++ /branches/2.0/calendar/templates/classic/event_link.tpl	(revision 1196)
@@ -0,0 +1,41 @@
+
+<!-- BEGIN link_event_pict -->
+{picture}
+<!-- END link_event_pict -->
+
+<!-- BEGIN link_event_open -->
+<table>
+
+<!--<div id="calendar_event_entry" style="overflow:hidden;">-->
+<!--<a class="event_entry" href="{link_link}" onMouseOver="window.status='{lang_view}'; return true;" onMouseOut="window.status=''; return true;" title="{desc} {location}"><br />--><br />
+<!-- END link_event_open -->
+
+<!-- BEGIN event_pict -->
+<!--<img src="{pic_image}" width="{width}" height="{height}" title="{title}" border="0" />-->
+<!-- END event_pict -->
+
+<!-- BEGIN link_event_text_old -->
+<!--<nobr>&nbsp;{time}&nbsp;</nobr> {title}&nbsp;{users_status}: <i>{desc}</i>({location}) -->
+<!-- END link_event_text_old -->
+
+<!-- BEGIN link_event_text -->
+	<tr style="font-size: 10px;background: #dddddd;">
+		<td valign="top" style="color: black; font-size: 11px;">
+			<span>
+				{time}
+			</span>
+		</td>
+		<td style="font-size: 11px; border: #E8F0F0 1px solid;" colspan="3">
+			<span><b>{title}</b></span>
+			<br />
+			<span><i>{desc}</i></span>
+			<span>{location}</span>
+			<br />
+		</td>
+	</tr>
+<!-- END link_event_text -->
+
+<!-- BEGIN link_event_close -->
+<!--</a></div><br />-->
+</table>
+<!-- END link_event_close -->
Index: /branches/2.0/calendar/templates/classic/footer.tpl
===================================================================
--- /branches/2.0/calendar/templates/classic/footer.tpl	(revision 1196)
+++ /branches/2.0/calendar/templates/classic/footer.tpl	(revision 1196)
@@ -0,0 +1,64 @@
+<!-- BEGIN footer_table -->
+       <hr clear="all">
+       <font size="-1">
+       <table border="0" width="100%" cellpadding="0" cellspacing="0">
+        <tr>
+{table_row}
+	</tr>
+       </table>
+<!-- END footer_table -->
+<!-- BEGIN footer_row -->
+         <td valign="top" width="30%">
+          <font size="-1">
+           <form action="{action_url}" method="post" name="{form_name}">
+            <B>{label}:</B>
+			{hidden_vars}
+            <select name="{form_label}" onchange="{form_onchange}">
+	     {row}
+	    </select>
+	    <input type="hidden" name="user" value="{user}">
+	    <input type="hidden" name="dia_ini" value="{dia_ini}">
+            <noscript><input type="submit" value="{go}"></noscript>
+	   </form>
+	  </font>
+	 </td>
+<!-- END footer_row -->
+<!-- BEGIN blank_row -->
+         <td>
+         {b_row}
+         </td>
+         <td>
+         {b_row2}
+         </td>
+<!-- END blank_row -->
+
+<!-- BEGIN num_dias -->
+<td valign="top" width="30%">
+ <font size="-1">
+    <form action="{acao}" method="post" name="{formname}">
+    <span style="display: {display}" >
+ 
+	<label>
+		<b>{num_dias_label}:</b>
+	</label>
+	<select name="{num_dias_name}" onchange="{formonchange}"/>
+		{row_qtd}
+	</select>
+	<br />
+	<span style="font-size: 9px;">
+		{tip}
+	</span>
+	<br /> <br />
+    </span>
+<span style="display: {display}">
+	<b>{day_ini_label}:</b>
+	<select name="{day_ini_name}" onchange="{formonchange}">
+	{row_ini}
+	</select>
+	</span>
+<input type="hidden" name="user" value="{user}">
+	<noscript><input type="submit" value="{go}"></noscript>
+     </form>
+ </font>
+</td>
+<!-- END num_dias -->
Index: /branches/2.0/calendar/templates/classic/publicView.php
===================================================================
--- /branches/2.0/calendar/templates/classic/publicView.php	(revision 1196)
+++ /branches/2.0/calendar/templates/classic/publicView.php	(revision 1196)
@@ -0,0 +1,89 @@
+<?php 	
+	$user = $_POST['user'] ? $_POST['user'] : 
+		($_GET['user'] ? $_GET['user']: '');
+	
+	if($user) {
+		$organization = $_POST['organization'] ? $_POST['organization'] : 
+		($_GET['organization'] ? $_GET['organization']: '');
+		
+		if($organization)
+			$arg1 = $organization."-".$user;
+		else
+			$arg1 = $user;
+		
+		$params = "&account_name=".$arg1;
+	}
+	else
+		$params = '';
+?>
+<html>
+	<head><title>Visualizar Agenda</title>
+	<head>
+	<style type="text/css">
+		.grid_right{
+		border-style: groove;
+		border-width: 0px;
+		border-right-width: 1px;		
+		border-color: BLACK;		
+		}
+		.grid_top{
+		border-style: groove;
+		border-width: 0px;
+		border-top-width: 1px;		
+		border-color: BLACK;		
+		}
+	</style>
+	<LINK href="../../../phpgwapi/templates/celepar/css/celepar.css" type=text/css rel=StyleSheet>
+	<script language="Javascript">
+		function validate(){
+			if(document.login.user.value =="")	{
+				alert('Você deve digitar um nome no campo Usuário.');
+				document.login.user.focus();
+				return false;
+			}
+			
+			return true;
+		}
+	</script>
+	</head>
+	<body>
+	  <div align="center" valign="center">
+		<table cellspacing="0" cellpadding="5" width="100%" height="100%">			
+			<tr><td width="10%" valign="center"  class="grid_right"><br>
+				<table border="0" cellpadding="0" cellspacing="0" class="login" height="100%" width="100%">
+					<tr>
+						<td valign="top">
+	  					<FORM name="login" method="post" action="publicView.php" onSubmit="javascript:return validate()">
+							<table border="0" cellpadding="0" cellspacing="0" class="tableLogin">
+								<tr>
+									<td width="66" class="loginLabel" align="center"><b>Organização</b><br><input type="text" value="<?=$organization?>" name="organization" size="15"></td>
+								</tr>
+								<tr>									
+									<td>&nbsp;</td>
+								</tr>
+								<tr>
+									<td width="136" align="center" class="loginLabel"><b>Usuário</b><br><input name="user" size="15" value="<?=$user?>"></td>
+								</tr>
+								<tr>									
+									<td height="16">&nbsp;</td>
+								</tr>
+								<tr>
+									<td width="135" colspan="2" align="center">						
+									<input type="submit" value="Visualizar" name="submitit" class=button >
+									</td>
+									</tr>
+							</table>
+							</FORM>
+						</td>
+					</tr>
+				</table>								
+			</td>
+				<td width="90%" valign="top">
+					<iframe  width="100%" height="95%" src="../../../index.php?menuaction=calendar.uipublicview.publicView<?=$params?>"
+						marginwidth="0" marginheight="0"  topmargin="0" leftmargin="0" frameborder="0" scrolling="auto" noresize>
+					</iframe>
+			</td></tr>
+		</table>
+	  </div>
+	</body>
+</html>
Index: /branches/2.0/calendar/templates/classic/month_print.tpl
===================================================================
--- /branches/2.0/calendar/templates/classic/month_print.tpl	(revision 1196)
+++ /branches/2.0/calendar/templates/classic/month_print.tpl	(revision 1196)
@@ -0,0 +1,26 @@
+{printer_friendly}
+<table class="calendar_index_table" id="calendar_index_table"  width="100%" cols="5">
+	<tr>
+		<td align="left" width="33%">
+			<span class="calendar_user_identifier">
+					{username}
+			</span>
+		</td>
+		<td align="center" width="33%">
+			<span class="calendar_month_identifier">
+				{month_identifier}
+			</span>
+		</td>
+		<td align="right" style="width: 33%; font-size: 14px;">
+			<span class="calendar_user_identifier">
+				<p>Agenda de Eventos</p>
+			</span>
+		</td>
+	</tr>
+</table>
+{large_month}
+<p>
+<p>
+<div class="calendar_link_print">
+	{print}
+</div>
Index: /branches/2.0/calendar/templates/classic/head.tpl
===================================================================
--- /branches/2.0/calendar/templates/classic/head.tpl	(revision 1196)
+++ /branches/2.0/calendar/templates/classic/head.tpl	(revision 1196)
@@ -0,0 +1,25 @@
+<!-- BEGIN head -->
+<script language="Javascript">
+function openwindow(url)
+{ 
+	
+	var window_features = 	"scrollbars=yes,resizable=yes,location=no,menubar=no," + 
+							"personalbar=no,status=no,titlebar=no,toolbar=no," + 
+							"screenX=screen.width/3,screenY=screen.height/3,top=screen.height/3,left=screen.width/3,width=" + 
+							screen.width/4*3 + ",height=" + screen.height/8*3; 
+	
+	self.open(url,'', window_features); 
+}
+</script>
+{row}<br />
+<!-- END head -->
+<!-- BEGIN head_table -->
+<table id="calendar_head_table" class="calendar_head_table" border="0" width="100%" cols="{cols}" cellpadding="0" cellspacing="0">
+	<tr>
+		{header_column}
+	</tr>
+</table>
+<!-- END head_table -->
+<!-- BEGIN head_col -->
+{str}
+<!-- END head_col -->
Index: /branches/2.0/calendar/templates/classic/body_email.tpl
===================================================================
--- /branches/2.0/calendar/templates/classic/body_email.tpl	(revision 1196)
+++ /branches/2.0/calendar/templates/classic/body_email.tpl	(revision 1196)
@@ -0,0 +1,32 @@
+<html>
+<head>
+<meta http-equiv="Content-Language" content="en" />
+<meta name="GENERATOR" content="PHPEclipse 1.0" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<title>title</title>
+</head>
+<body bgcolor="#FFFFFF" text="#000000" link="#FF9966" vlink="#FF9966" alink="#FFCC99">
+<!-- BEGIN list -->
+<b><p align='left'>{subject}</p></b>
+<br>
+<table border='0' cellpadding='0' cellspacing='0' width='100%'>
+<tr><td width='30%' valign='top'><b>{var1} ::</b></td><td>{vardata1}</td></tr>	
+<tr><td width='30%' valign='top'><b>{var2} ::</b></td><td>{vardata2}</td></tr>
+<tr><td width='30%' valign='top'><b>{var3} ::</b></td><td>{vardata3}</td></tr>
+<tr><td width='30%' valign='top'><b>{var4} ::</b></td><td>{vardata4}</td></tr>
+<tr><td width='25%' valign='top'><b>{var8} ::</b></td><td>{vardata8}</td></tr>
+<tr><td width='25%' valign='top'><b>{var5} ::</b></td><td>{vardata6}</td></tr>
+</table>
+<br>
+<hr size='1' width='100%'>
+<table border='0' cellpadding='4' cellspacing='4' width='100%'>
+<tr>
+<td width='2%' align='left'>{varbuttom}</td>
+<td width='2%' align='left' valign='top'>{varbuttom1}</td>
+<td width='2%' align='left' valign='top'>{varbuttom2}</td>
+<td width='94%' align='left' valign='top'>{varbuttom3}</td>
+</tr>
+</table>
+<!-- END list -->
+</body>
+</html>
Index: /branches/2.0/calendar/templates/classic/config.tpl
===================================================================
--- /branches/2.0/calendar/templates/classic/config.tpl	(revision 1196)
+++ /branches/2.0/calendar/templates/classic/config.tpl	(revision 1196)
@@ -0,0 +1,107 @@
+<!-- BEGIN header -->
+<script type="text/javascript">
+
+function disableMinNum(valor){
+  if( valor == "True" ){
+	document.getElementById("minNum").disabled = true;
+	document.getElementById("minNum").value = 0;
+  }
+  else if (valor == "False"){
+	document.getElementById("minNum").disabled = false;
+  }
+}
+</script>
+<form name="adminForm" method="POST" action="{action_url}" onSubmit="return minValue()">
+<table border="0" align="center">
+   <tr bgcolor="{th_bg}">
+    <td colspan="2"><font color="{th_text}">&nbsp;<b>{title}</b></font></td>
+   </tr>
+<!-- END header -->
+
+<!-- BEGIN body -->
+   <tr bgcolor="{row_on}">
+    <td colspan="2">&nbsp;</td>
+   </tr>
+   <tr bgcolor="{row_off}">
+    <td colspan="2"><b>{lang_Calendar_settings}</b></td>
+   </tr>
+   <tr bgcolor="{row_on}">
+    <td>{lang_Do_you_wish_to_autoload_calendar_holidays_files_dynamically?}</td>
+    <td>
+     <select name="newsettings[auto_load_holidays]">
+      <option value=""{selected_auto_load_holidays_False}>{lang_No}</option>
+      <option value="True"{selected_auto_load_holidays_True}>{lang_Yes}</option>
+     </select>
+    </td>
+   </tr>
+   <tr bgcolor="{row_off}">
+    <td>{lang_Location_to_autoload_from}:</td>
+    <td>
+     <select name="newsettings[holidays_url_path]">
+      <option value="localhost"{selected_holidays_url_path_localhost}>localhost</option>
+      <option value="http://www.phpgroupware.org/cal"{selected_holidays_url_path_http://www.phpgroupware.org/cal}>www.phpgroupware.org</option>
+     </select>
+    </td>
+   <tr bgcolor="{row_on}">
+    <td colspan="2">&nbsp;</td>
+   </tr>    
+   </tr>
+    <tr bgcolor="{row_off}">
+    <td colspan="2"><b>{lang_ExpressoMail_Plugin_Calendar}</b></td>
+   </tr>
+   <tr bgcolor="{row_on}">
+    <td>{lang_Select_module_version_expressoMail_(if_available)}</td>
+    <td>
+     <select name="newsettings[cal_expressoMail]">
+      <option value="False"{selected_cal_expressoMail_False}>{lang_dont_use_any_plugin}</option>
+      <option value="1.0"{selected_cal_expressoMail_1.0}>Expresso 1.0</option>
+      <option value="1.2"{selected_cal_expressoMail_1.2}>Expresso 1.2</option>
+     </select>
+    </td>
+   </tr>
+    <tr bgcolor="{row_off}">
+    <td>{lang_Select_type_tree_view}</td>
+    <td>
+     <select name="newsettings[cal_type_tree_participants]">
+      <option value="3" {selected_cal_type_tree_participants_3}>{lang_all_levels}</option>
+      <option value="2" {selected_cal_type_tree_participants_2}>{lang_first_level_with_recursive_search}</option>
+      <option value="1" {selected_cal_type_tree_participants_1}>{lang_all_levels_with_not_recursive_search}</option>      
+     </select>
+    </td>
+   </tr>
+   
+   <tr bgcolor="{row_on}">
+     <td>{lang_Do_you_wish_enable_autosearch?}</td>
+     <td>
+       <select id="autoSearch" name="newsettings[auto_search]" onchange="disableMinNum(this.value)">
+        <option value="False"{selected_auto_search_False}>{lang_No}</option>
+        <option value="True"{selected_auto_search_True}>{lang_Yes}</option>
+       </select>
+     </td>
+   </tr>
+   
+   <tr bgcolor="{row_off}">
+       <td>{lang_Minimum_number_of_characters_to_start_the_search_for_participants}</td>
+       <td>
+          <input type="text" id="minNum" value="{value_min_num_characters}" name="newsettings[min_num_characters]    " size=2 maxlength=2 />
+       </td>
+   </tr>
+
+   <script> disableMinNum(document.getElementById("autoSearch").value); </script>
+<!-- END body -->
+
+<!-- BEGIN footer -->
+  <tr bgcolor="{th_bg}">
+    <td colspan="2">
+&nbsp;
+    </td>
+  </tr>
+  <tr>
+    <td colspan="2" align="center">
+      <input type="submit" name="submit" value="{lang_submit}">
+      <input type="submit" name="cancel" value="{lang_cancel}">
+     </td>
+  </tr>
+</table>
+</form>
+<!-- END footer -->
Index: /branches/2.0/calendar/templates/classic/grant_group_access.tpl
===================================================================
--- /branches/2.0/calendar/templates/classic/grant_group_access.tpl	(revision 1196)
+++ /branches/2.0/calendar/templates/classic/grant_group_access.tpl	(revision 1196)
@@ -0,0 +1,65 @@
+<div align="center" style="width:100%">
+<input type="hidden" id="txt_loading" value="{lang_Loading}">
+<input type="hidden" id="txt_searching" value="{lang_Searching}">
+<input type="hidden" id="txt_users" value="{lang_Users}">
+<input type="hidden" id="txt_groups" value="{lang_Groups}">
+<input type="hidden" id="txt_confirm" value="{lang_confirm}">
+<input type="hidden" id="txt_success" value="{lang_success}">
+<input type="hidden" id="txt_exist" value="{lang_exist}">
+<input type="hidden" id="txt_nouser" value="{lang_nouser}">
+<input type="hidden" id="txt_nogroup" value="{lang_nogroup}">
+<input type="hidden" id="txt_nopermissiontype" value="{lang_nopermissiontype}">
+<input type="hidden" id="txt_typemoreletters" value="{lang_typemoreletters}">
+<input type="hidden" id="template_set" value="{template_set}">
+<table width="80%" border="0">
+<tr>
+<td align='center' valign="bottom"><br><b>{lang_User_to_grant_access}</b><br>
+	<font color="red"><span id="cal_span_searching1">&nbsp;</span></font>
+	<br>{lang_Search_for}: <input type="text" id="cal_input_searchUser1" name="cal_input_searchUser1" value="" size=30 autocomplete="off" onkeyup="javascript:search_object(this,'cal_span_searching1','user','u')"/>
+	<br><br>
+	<select id="user" style="width: 300px" size="13"></select>
+</td>
+<td width="20px" valign="middle" align="left"><br><br><br><br>
+<button type="button" onClick="javascript:add_user();"><img src="{template_set}/images/add.png" style="vertical-align: middle;" >{lang_Add}</button>
+<br><br><b>{lang_access_type}</b><br>
+<input type="checkbox" id="right_L" value="L"/>{lang_read}<br>
+<input type="checkbox" id="right_A" value="A"/>{lang_add}<br>
+<input type="checkbox" id="right_E" value="E"/>{lang_edit}<br>
+<input type="checkbox" id="right_R" value="R"/>{lang_delete}<br>
+<input type="checkbox" id="right_P" value="P"/>{lang_private}
+</td>
+<td align='center' valign="bottom"><br><b>{lang_Group_to_share_calendar}</b><br>
+	<font color="red"><span id="cal_span_searching2">&nbsp;</span></font>
+	<br>{lang_Search_for}:	<input type="text" id="cal_input_searchUser2" name="cal_input_searchUser2" value="" size=30 autocomplete="off" onkeyup="javascript:search_object(this,'cal_span_searching2','group','g')"/><br><br>
+	<select id="group" style="width: 300px" size="13"></select>
+</td>
+</tr>
+	<tr height="20px"></tr>
+	<tr bgcolor="{tr_color}" style="font-size:0.8em">
+		<th align="left" width="25%" nowrap>&nbsp;{lang_granted_user}</th>
+		<th align="center" width="1%">{lang_access_type}</th>
+		<th align="left" width="40%" nowrap>&nbsp;{lang_shared_group}</th>
+		<th width="1%">&nbsp;</th>
+	</tr>
+<tbody id='tbody_list' >
+<!-- BEGIN list -->
+	<tr id='{select}' bgcolor="{tr_color_header}">
+		<td>
+			<b>&nbsp;&nbsp;{granted_user}</b>
+		</td>
+		<td align="center">
+			{access_type}
+		</td>		
+		<td>
+			&nbsp;&nbsp;{shared_group}
+		</td>
+		<td align="center">
+			<button  title="{lang_Remove}" type="button" onClick="javascript:remove_user('{select}');"><img alt="{lang_Remove}" src="{template_set}/images/delete.png" style="vertical-align: middle;"/></button>
+		</td>
+	</tr>
+<!-- END list -->
+</tbody>
+</table>
+<br><br>
+</div>
+{scripts}
Index: /branches/2.0/calendar/templates/classic/app.css
===================================================================
--- /branches/2.0/calendar/templates/classic/app.css	(revision 1196)
+++ /branches/2.0/calendar/templates/classic/app.css	(revision 1196)
@@ -0,0 +1,290 @@
+/* CSS Document */
+.calendar_print_main {
+	text-align:center;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 8px;
+	color: #000066;
+	background-color: #F7F7F7;
+	border: 1px solid #CCCCCC;
+	margin: 5px;
+	padding: 5px;
+	height: 156px;
+	width: 480px;
+}
+
+.button
+{
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	color: 006699;
+	background-color: #D4D0C8;
+	border: 2px solid #666666;
+}
+
+.to_continue
+{
+	font-size: 9px;
+}
+
+A.minicalendar 
+{ 
+	color: #000000; 
+	font-size: 9px;
+	
+}
+
+A.bminicalendar 
+{ 
+	color: #336699; 
+	font-style: italic;
+	font-weight: bold;
+	font-size: 9px; 
+}
+
+A.minicalendargrey 
+{ 
+	color: #999999; 
+	font-size: 10px;
+	font-weight: bold;
+}
+
+A.bminicalendargrey 
+{ 
+	color: #336699; 
+	font-style: italic; 
+	font-size:10px; 
+}
+
+A.minicalhol
+{ 
+	padding-left:3px;
+	padding-right:3px;
+	background: #dab0b0;
+	color: #000000; 
+	font-size: 10px; 
+}
+
+A.bminicalhol
+{ 
+	padding-left:3px;
+	padding-right:3px;
+	background: #dab0b0;
+	color: #336699; 
+	font-size: 10px; 
+}
+
+A.minicalgreyhol
+{ 
+	padding-left:3px;
+	padding-right:3px;
+	background: #dab0b0;
+	color: #999999; 
+	font-size: 10px; 
+}
+
+A.bminicalgreyhol
+{ 
+	padding-left:3px;
+	padding-right:3px;
+	background: #dab0b0;
+	color: #999999; 
+	font-size: 10px; 
+}
+
+
+.event-on
+{ 
+	background: #D3DCE3;
+	border: #E8F0F0 1px solid;
+}
+
+.event-off
+{ 
+	background: #E8F0F0;
+	border: #D3DCE3 1px solid;
+}
+
+.event-holiday
+{
+	font-size: 100%;
+	background: #dac0c0;
+	color:#000000;
+	vertical-align: middle;
+}
+
+.time
+{
+	background: #D3DCE3;
+	color:#000000;
+	font-size: 10px;
+	font-weight: bold;
+	vertical-align: middle;
+	width: 5.2%;
+	text-align: right;
+	padding-right: 5px;
+	line-height: 11px;
+	border: #E8F0F0 1px solid;
+}
+
+
+.planner-cell
+{
+	cursor: pointer;
+	cursor: hand;
+	border: thin solid black;
+}
+
+/* common */
+.calendar_link_print
+{
+	text-align: center;
+	font-size: 10px;
+}
+
+//Mini Calendar
+
+.calendar_minical_table
+{
+	width: 180px;
+	font-weight: bold;
+}
+
+.calendar_minical_daytable
+{
+	width: 100%;
+}
+
+.calendar_minical_dayname
+{
+	font-size: 9px;
+	text-align: right;
+}
+
+.calendar_minical_hrule
+{
+	width: 96%;
+}
+
+/* Header */
+.calendar_dropbuttons
+{
+	align: center;
+	text-align: center;
+	vertical-align: bottom;
+	font-weight: bold;
+	font-size: 8px;
+}
+
+.calendar-weekidentifier
+{
+	font-size:16px;
+	font-weight: bold;
+	text-align: center;
+}
+
+.calendar_header
+{
+	font-size: 16px;
+	font-weight: bold;
+	text-align: center;
+}
+
+.calendar_dayview_table_header
+{
+	font-size: 13px;
+	font-weight: bold;
+	text-align: center;
+}
+
+.calendar_dayview_todo_header
+{
+	margin: 0px; 
+	padding: 2px;
+	font-weight: bold;
+}
+
+/* week view */
+.calendar_week_identifier_table
+{
+	border: 0px solid black;
+	width: 100%;
+}
+
+.calendar_week_identifier
+{
+	font-size: 13px;
+	text-align: center;
+	font-weight: bold;
+}
+
+.calendar_weekview_daytitle
+{
+	font-weight: bold;
+	font-size: 12px;
+	background: #D3DCE3;
+}
+
+.calendar_m_w_table
+{
+	table-layout:fixed;
+	overflow:hidden;
+	height: 90%;
+	width: 100%;
+	border: 0px #000000 solid;
+}
+
+.calendar_m_w_tablecell
+{
+	overflow:hidden;
+	vertical-align: top;
+	padding-left: 4px;
+	padding-right: 4px;
+	padding-bottom: 6px;
+}
+
+.screen_only
+{
+	font-size: 10px;
+}
+
+.calendar_m_w_table_daynumber
+{
+	font-weight: bold;
+	font-size: 10px;
+}
+
+A.event_entry
+{
+	font-size:10px;
+}
+
+/* month view */
+
+.calendar_month_identifier
+{
+	font-size:14px;
+	font-weight: bold;
+}
+
+.calendar_user_identifier
+{
+	font-size:12px;
+	color: #009999;
+	font-weight: bold;
+}
+
+.calendar_week_minical_table
+{
+	width:100%;
+	border: 0px solid #000000
+}
+
+.calendar_weekinfo
+{
+	color: #000000;
+	padding-left: 2px;
+	padding-right: 2px;
+	font-size: 10px;
+	font-weight: bold;
+	font-style: italic;
+}
Index: /branches/2.0/calendar/templates/classic/publicView.tpl
===================================================================
--- /branches/2.0/calendar/templates/classic/publicView.tpl	(revision 1196)
+++ /branches/2.0/calendar/templates/classic/publicView.tpl	(revision 1196)
@@ -0,0 +1,2 @@
+{week_display}
+</div>
Index: /branches/2.0/calendar/templates/classic/view.tpl
===================================================================
--- /branches/2.0/calendar/templates/classic/view.tpl	(revision 1196)
+++ /branches/2.0/calendar/templates/classic/view.tpl	(revision 1196)
@@ -0,0 +1,46 @@
+
+<!-- BEGIN view_event -->
+<center>
+<table id="calendar_view_event" border="0" width="90%">
+	{row}
+	<tr>
+		<td>
+			<table id="calendar_viewevent_button_left" cellspacing="5">
+				<tr>
+					{button_left}
+				</tr>
+			</table>
+		</td>
+	   <td align="center">
+			<table id="calendar_viewevent_button_center" cellspacing="5">
+				<tr>
+					{button_center}
+				</tr>
+			</table>
+		</td>
+		<td align="right">
+			<table id="calendar_viewevent_button_right" cellspacing="5">
+				<tr>
+					{button_right}
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+</center>
+<!-- END view_event -->
+
+<!-- BEGIN list -->
+	<tr bgcolor="{tr_color}">
+		<td valign="top" width="30%">&nbsp;<b>{field}:</b></td>
+		<td colspan="2" valign="top" width="70%">{data}</td>
+	</tr>
+<!-- END list -->
+
+<!-- BEGIN hr -->
+	<tr>
+		<td colspan="3" bgcolor="{th_bg}" align="center">
+			<b>{hr_text}</b>
+		</td>
+	</tr>
+<!-- END hr -->
Index: /branches/2.0/calendar/templates/classic/day.tpl
===================================================================
--- /branches/2.0/calendar/templates/classic/day.tpl	(revision 1196)
+++ /branches/2.0/calendar/templates/classic/day.tpl	(revision 1196)
@@ -0,0 +1,39 @@
+<!-- BEGIN day -->
+{printer_friendly}
+<table id="calendar_dayview_table" class="calendar_dayview_table" border="0" width="100%">
+	<tr>
+		<td valign="top" width="70%">
+			<table id="calendar_dayview1" border="0" width=100%>
+				<tr>
+					<td class="calendar_dayview_table_header">
+      					{date}&nbsp;<span class="calendar_user_identifier">:&nbsp;{username}&nbsp;:</span>
+						<br />
+     				</td>
+    			</tr>
+				{day_events}
+   			</table>
+   			<p align="center">{print}</p>
+  		</td>
+ 		 <td align="center" valign="top">
+  			 <table id="calendar_dayview2" width="100%">
+    			<tr>
+     				<td align="center">
+						{small_calendar}
+     				</td>
+    			</tr>
+
+   			</table>
+  		</td>
+ 	</tr>
+</table>
+<!-- END day -->
+
+<!-- BEGIN day_event -->
+	<tr>
+		<td>
+
+			{daily_events}
+
+		</td>
+	</tr>
+<!-- END day_event -->
Index: /branches/2.0/calendar/templates/classic/js/edit_exmail.js
===================================================================
--- /branches/2.0/calendar/templates/classic/js/edit_exmail.js	(revision 1196)
+++ /branches/2.0/calendar/templates/classic/js/edit_exmail.js	(revision 1196)
@@ -0,0 +1,389 @@
+/******************************************************************************\
+|**************************   CALENDAR MODULE   *******************************|
+|********** INCLUDE PARTICIPANTS - PLUGIN USING AJAX EXPRESSOMAIL COMPONENT  **|
+\******************************************************************************/
+var contacts = '';
+var array_lang = new Array();
+var finderTimeout = '';
+// onUnload edit message
+if(!document.all)
+{
+	var beforeunload = window.onbeforeunload;
+	window.onbeforeunload = function()
+	{
+		if ( typeof beforeunload == 'function' )
+			beforeunload();
+	};
+}
+	
+// Verifica versão do Firefox
+var agt = navigator.userAgent.toLowerCase();
+var is_firefox_0 = agt.indexOf('firefox/1.0') != -1 && agt.indexOf('firefox/0.') ? true : false;
+ 
+function get_available_users(filter,autoSearch)
+//function get_available_users(path,context,type)
+{
+	text= document.getElementById("cal_input_searchUser");
+	
+	var handler_get_available_users = function(data)
+	{	
+		select_available_users = document.getElementById('user_list_in');
+		
+		for(var i=0; i<select_available_users.options.length; i++){
+			select_available_users.options[i] = null;
+			i--;
+		}
+		var options = '###';
+		if (data) {
+			if(data.groups && data.groups.length > 0) {
+				data.groups = '<option  value="-1" disabled>------------------- '+document.getElementById("txt_groups").value+' ------------------ </option>' + data.groups;
+			}
+			
+			if(data.users && data.users.length > 0) {
+				data.users = '<option  value="-1" disabled>------------------- '+document.getElementById("txt_users").value+' ------------------ </option>' + data.users;
+			}
+			options +=  data.groups && data.groups.length > 0 ? data.groups : '';
+			options +=  data.users  && data.users.length  > 0 ? data.users  : '';
+			
+			if(is_firefox_0)
+				fixBugInnerSelect(select_available_users,options);
+			else
+				select_available_users.innerHTML = options;
+
+			select_available_users.outerHTML = select_available_users.outerHTML;
+			select_available_users.disabled = false;
+			select_available_users_clone = document.getElementById('user_list_in').cloneNode(true);
+			//document.getElementById('cal_input_searchUser').value = '';
+		}
+	}	
+		context = document.getElementById('combo_org').value;
+		cExecute ('expressoMail1_2'+'.ldap_functions.search_users&filter='+filter+'&context='+context+'&type=search', handler_get_available_users);
+		
+		if((autoSearch == 'True') && (!text.value)){
+	                var search = " ";
+	                get_available_users(search);
+	        }
+		//cExecute (path+'.ldap_functions.get_available_users&context='+context+'&type='+type, handler_get_available_users);
+}
+
+function optionFinderTimeout(obj,numMin){
+		var oWait = document.getElementById("cal_span_searching");
+		clearTimeout(finderTimeout);
+		if (obj.value.length >= numMin){				
+			oWait.innerHTML = 'Buscando...';
+			finderTimeout = setTimeout("optionFinder('"+obj.id+"','"+numMin+"')",500);
+		}else {
+			oWait.innerHTML = 'Mínimo de '+numMin+' letras para pesquisa';
+			var select_available_users_tmp = document.getElementById('user_list_in');
+			for(var i = 0;i < select_available_users_tmp.options.length; i++)
+			select_available_users_tmp.options[i--] = null;
+		}
+}
+	
+function optionFinder(id,numMin){
+	
+		var oWait = document.getElementById("cal_span_searching");
+		var oText = document.getElementById(id);
+			
+		if (oText.value.length < numMin) {
+				oWait.innerHTML = '';
+				var select_available_users_tmp = document.getElementById('user_list_in');
+				for(var i = 0;i < select_available_users_tmp.options.length; i++)
+					select_available_users_tmp.options[i--] = null;
+		}
+		
+		if (oText.value.length >= numMin) {
+			get_available_users(oText.value);
+		
+			var select_available_users_tmp = document.getElementById('user_list_in');
+			for(var i = 0;i < select_available_users_tmp.options.length; i++)
+				select_available_users_tmp.options[i--] = null;
+			var RegExp_name = new RegExp("\\b"+oText.value, "i");
+	
+			oWait.innerHTML = '&nbsp;';
+		}
+}
+	function autoOptionFinder(){
+		var oWait = document.getElementById("cal_span_searching");
+                var oText = document.getElementById(id);
+		var select_available_users_tmp = document.getElementById('user_list_in');
+                for(var i = 0;i < select_available_users_tmp.options.length; i++)
+                	select_available_users_tmp.options[i--] = null;
+		var RegExp_name = new RegExp("\\b   ", "i");
+		oWait.innerHTML = '&nbsp;';
+	}
+
+function add_user()
+{
+	var select_available_users = document.getElementById('user_list_in');
+	var select_users = document.getElementById('user_list');
+	var count_available_users = select_available_users.length;
+	var count_users = select_users.options.length;
+	var new_options = '';
+	
+	for (i = 0 ; i < count_available_users ; i++) {
+		if (select_available_users.options[i].selected)	{
+			if(document.all) {
+				if ( (select_users.innerHTML.indexOf('value='+select_available_users.options[i].value)) == '-1' ) {
+					new_options +=  '<option value='
+								+ select_available_users.options[i].value
+								+ '>'
+								+ select_available_users.options[i].text
+								+ '</option>';
+				}
+			}
+			else if ( (select_users.innerHTML.indexOf('value="'+select_available_users.options[i].value+'"')) == '-1' ) {
+					new_options +=  '<option value='
+								+ select_available_users.options[i].value
+								+ '>'
+								+ select_available_users.options[i].text
+								+ '</option>';
+			}
+		}
+	}
+
+	if (new_options != '') {
+
+		if(is_firefox_0)
+			fixBugInnerSelect(select_users,'###' + new_options + select_users.innerHTML);
+		else
+			select_users.innerHTML = '###' + new_options + select_users.innerHTML;
+
+		select_users.outerHTML = select_users.outerHTML;
+	}
+}
+
+function remove_user(){
+	select_users = document.getElementById('user_list');
+	
+	for(var i = 0;i < select_users.options.length; i++)
+		if(select_users.options[i].selected)
+			select_users.options[i--] = null;
+}
+
+function submitValues(){
+	var typeField = document.getElementById('cal[type]');
+	if (typeField && typeField.value == 'hourAppointment') {
+		if(document.getElementsByName('categories[]')[0].value == ""){
+			alert(alert_msg);
+			return false;
+		}
+	}
+	var select_in = document.getElementById('user_list');
+	for(i = 0; i < select_in.length; i++)
+	 	select_in.options[i].selected = true;
+}	
+
+function Element(id){
+	return document.getElementById(id);
+}
+
+function loadScript(scriptPath){
+
+	if(!connector)
+		throw new Error("Error : Connector is not loaded.");
+		
+  	if (document.getElementById('uploadscript_'+scriptPath)) {
+  		return;
+   	}
+  	
+	connector.oxmlhttp.open("GET", scriptPath, false);
+    connector.oxmlhttp.setRequestHeader('Content-Type','text/plain');
+	connector.oxmlhttp.send(null);
+	if(connector.oxmlhttp.status != 0 && connector.oxmlhttp.status != 200 || 	connector.oxmlhttp.status == 0 && connector.oxmlhttp.responseText.length == 0)
+		throw new Error("Error " + connector.oxmlhttp.status + "("+connector.oxmlhttp.statusText+") when loading script file '"+scriptPath+"'");
+	
+	var head = document.getElementsByTagName("head")[0];
+	var script = document.createElement("SCRIPT");
+	script.id = 'uploadscript_'+scriptPath;
+	script.type = 'text/javascript';		
+	script.text = connector.oxmlhttp.responseText;
+	head.appendChild(script);
+	return;	
+}
+
+function showExParticipants(el,path){
+	Element('tbl_ext_participants').style.display='';
+	el.style.display='none';
+	loadScript(path+"/js/DropDownContacts.js");
+	loadScript(path+"/js/common_functions.js");
+	loadScript(path+"/js/QuickCatalogSearch.js");
+	loadScript("calendar/templates/celepar/js/over_fn_exmail.js");
+	if(!contacts)
+		cExecute (path+'.db_functions.get_dropdown_contacts', save_contacts);
+}
+
+function hideExParticipants(el,path){
+	Element('a_ext_participants').style.display = '';
+	Element('tbl_ext_participants').style.display ='none';
+}
+
+function save_contacts(data){
+	contacts = data;	
+	var input_to = Element("ex_participants");
+	input_to.style.width = "100%";
+	input_to.setAttribute("wrap","soft");	
+	input_to.onfocus = function(){clearTimeout(parseInt(setTimeOutLayer)); search_contacts('onfocus', this.id);};
+	input_to.onblur = function(){setTimeOutLayer=setTimeout('search_contacts("lostfocus","'+this.id+'")',100);};
+	if (!is_ie)
+	{
+		input_to.rows = 2;
+		input_to.onkeypress = function (e)
+		{
+			if ((e.keyCode) == 120) //F9
+			{
+				emQuickSearch(input_to);
+			}
+			else 
+			{ 
+				if (((e.keyCode == 13) || ((e.keyCode == 38)||(e.keyCode == 40))) && (document.getElementById('tipDiv').style.visibility!='hidden'))
+				{
+					e.preventDefault();
+					search_contacts(e.keyCode,this.id);
+				}
+			}
+		}
+		input_to.onkeyup = function (e)
+		{
+			if ((e.keyCode != 13) && (e.keyCode != 38) && (e.keyCode != 40))
+			{
+				search_contacts(e.keyCode,this.id);
+			}
+		}
+	}
+	else
+	{
+		input_to.rows = 3;
+		input_to.onkeyup = function (e)
+		{
+			if ((window.event.keyCode) == 120) //F9
+			{
+				emQuickSearch(input_to);
+			}
+			else 
+			{ 
+				search_contacts(window.event.keyCode,this.id);
+			}	
+		}
+	}
+}
+
+function fixBugInnerSelect(objeto,innerHTML){
+/******
+* select_innerHTML - altera o innerHTML de um select independente se é FF ou IE
+* Corrige o problema de não ser possível usar o innerHTML no IE corretamente
+* Veja o problema em: http://support.microsoft.com/default.aspx?scid=kb;en-us;276228
+* Use a vontade mas coloque meu nome nos créditos. Dúvidas, me mande um email.
+* Versão: 1.0 - 06/04/2006
+* Autor: Micox - Náiron José C. Guimarães - micoxjcg@yahoo.com.br
+* Parametros:
+* objeto(tipo object): o select a ser alterado
+* innerHTML(tipo string): o novo valor do innerHTML
+*******/
+    objeto.innerHTML = ""
+    var selTemp = document.createElement("micoxselect")
+    var opt;
+    selTemp.id="micoxselect1"
+    document.body.appendChild(selTemp)
+    selTemp = document.getElementById("micoxselect1")
+    selTemp.style.display="none"
+    if(innerHTML.toLowerCase().indexOf("<option")<0){//se não é option eu converto
+        innerHTML = "<option>" + innerHTML + "</option>"
+    }
+    innerHTML = innerHTML.replace(/<option/g,"<span").replace(/<\/option/g,"</span")
+    selTemp.innerHTML = innerHTML
+    for(var i=0;i<selTemp.childNodes.length;i++){
+        if(selTemp.childNodes[i].tagName){
+            opt = document.createElement("OPTION")
+            for(var j=0;j<selTemp.childNodes[i].attributes.length;j++){
+                opt.setAttributeNode(selTemp.childNodes[i].attributes[j].cloneNode(true))
+            }
+            opt.value = selTemp.childNodes[i].getAttribute("value")
+            opt.text = selTemp.childNodes[i].innerHTML
+            if(document.all){ //IEca
+                objeto.add(opt)
+            }else{
+                objeto.appendChild(opt)
+            }                    
+        }    
+    }
+    document.body.removeChild(selTemp)
+    selTemp = null
+}
+
+function changeViewMode(eltype){
+	var chValue = eltype;
+	switch (chValue){
+		case 'hourAppointment':
+			var names=new Array('title','priority','location','alarmhours','alarmminutes','recur_type','rpt_use_end','recur_interval','rpt_label');
+			for (var i=0; i < names.length; i++)
+			{
+				var Field = document.getElementsByName('cal['+names[i]+']');
+				if (Field[0])
+					Field[0].parentNode.parentNode.style.display = "none";
+			}
+
+			Field = document.getElementsByName('participants[]');
+			Field[0].parentNode.parentNode.style.display = "none";
+			Field[1].parentNode.parentNode.style.display = "none";
+			Field = document.getElementById('txt_loading');
+			Field.parentNode.parentNode.style.display = "none";
+			Field = document.getElementsByName('cal[rpt_day][]');
+			Field[0].parentNode.parentNode.style.display = "none";
+			break;
+		case 'privateHiddenFields':
+			var names=new Array('title','priority','location','alarmhours','alarmminutes','recur_type','rpt_use_end','recur_interval','rpt_label');
+			for (var i=0; i < names.length; i++)
+			{
+				var Field = document.getElementsByName('cal['+names[i]+']');
+				if (Field[0])
+					Field[0].parentNode.parentNode.style.display = "";
+			}
+			Field = document.getElementsByName('participants[]');
+			Field[0].parentNode.parentNode.style.display = "none";
+			Field[1].parentNode.parentNode.style.display = "none";
+			Field = document.getElementById('txt_loading');
+			Field.parentNode.parentNode.style.display = "none";
+			Field = document.getElementsByName('cal[rpt_day][]');
+			Field[0].parentNode.parentNode.style.display = "";
+			break;
+		default:
+			var names=new Array('title','priority','location','alarmhours','alarmminutes','recur_type','rpt_use_end','recur_interval','rpt_label');
+			for (var i=0; i < names.length; i++)
+			{
+				var Field = document.getElementsByName('cal['+names[i]+']');
+				if (Field[0])
+					Field[0].parentNode.parentNode.style.display = "";
+			}
+			Field = document.getElementsByName('participants[]');
+			Field[0].parentNode.parentNode.style.display = "";
+			Field[1].parentNode.parentNode.style.display = "";
+			Field = document.getElementById('txt_loading');
+			Field.parentNode.parentNode.style.display = "";
+			Field = document.getElementsByName('cal[rpt_day][]');
+			Field[0].parentNode.parentNode.style.display = "";
+			break;
+	}
+
+}
+function updateTitleField(select){
+	var typeField = document.getElementsByName('cal[type]');
+	if (typeField[0].value != 'hourAppointment')
+		return;
+	var titleField = document.getElementsByName('cal[title]');
+	var optionsArray = select.childNodes;
+	titleField[0].value = '';
+	for(option in optionsArray)
+		if (optionsArray[option].selected)
+			titleField[0].value += optionsArray[option].text + ' ';
+}
+
+var __onLoad = window.onload;
+window.onload = function(){ 
+	__onLoad();
+	var cal_type = document.getElementById('cal[type]').value;
+	changeViewMode(cal_type);
+	if(cal_type == 'hourAppointment'){
+		clearTimeout(timeout_get_available_users);
+	}
+};
Index: /branches/2.0/calendar/templates/classic/js/edit.js
===================================================================
--- /branches/2.0/calendar/templates/classic/js/edit.js	(revision 1196)
+++ /branches/2.0/calendar/templates/classic/js/edit.js	(revision 1196)
@@ -0,0 +1,101 @@
+/******************************************************************************\
+|**************************   MODULO   AGENDA   *******************************|
+|********** SCRIPT REFERENTE A CAIXA DE INCLUSAO DE PARTICIPANTES  ************|
+\******************************************************************************/
+
+// Variaveis Locais 
+	var select_in  = document.getElementById('user_list');
+	var select_out  = document.getElementById('user_list_in');	
+	var users_out = select_out.cloneNode(true);
+	var finderTimeout = '';
+																		
+// Funcoes				
+	function showExParticipants(el,path){
+		document.getElementById('tbl_ext_participants').style.display='';
+		el.style.display='none';
+	}
+	
+	function hideExParticipants(el,path){
+		document.getElementById('a_ext_participants').style.display = '';
+		document.getElementById('tbl_ext_participants').style.display ='none';
+	}
+							
+	function optionFinderTimeout(obj){
+
+		clearTimeout(finderTimeout);	
+		var oWait = document.getElementById("wait");
+		oWait.innerHTML = 'Buscando...';
+		finderTimeout = setTimeout("optionFinder('"+obj.id+"')",500);
+	}
+	function optionFinder(id) {	
+		var oWait = document.getElementById("wait");
+		var oText = document.getElementById(id);
+		for(var i = 0;i < select_out.options.length; i++)				
+			select_out.options[i--] = null;
+																							
+		for(i = 0; i < users_out.length; i++){																							
+			if(users_out[i].text.substring(0 ,oText.value.length).toUpperCase() == oText.value.toUpperCase()) {
+				sel = select_out.options;						
+				option = new Option(users_out[i].text,users_out[i].value);				
+				sel[sel.length] = option;
+			}
+		}
+		oWait.innerHTML = '&nbsp;';
+	}			
+									
+	function rem()
+	{
+		for(var i = 0;i < select_in.options.length; i++)				
+			if(select_in.options[i].selected)
+				select_in.options[i--] = null;																	
+	}
+													 									
+	function submitValues(alert_msg){
+		var typeField = document.getElementById('cal[type]');
+		if (typeField && typeField.value == 'hourAppointment')
+			if(document.getElementsByName('categories[]')[0].value == ""){
+				alert(alert_msg);
+				return false;
+				}
+		for(i = 0; i < select_in.length; i++)
+		 	select_in.options[i].selected = true;
+	}
+	
+	
+	
+	function openListUsers(newWidth,newHeight, owner){					
+		newScreenX  = screen.width - newWidth;		
+		newScreenY  = 0;		
+		window.open('calendar/templates/celepar/listUsers.php?owner='+owner,"","width="+newWidth+",height="+newHeight+",screenX="+newScreenX+",left="+newScreenX+",screenY="+newScreenY+",top="+newScreenY+",toolbar=no,scrollbars=yes,resizable=no");
+	}
+
+ 	function adicionaListaCalendar() 
+ 	{
+		var select = window.document.getElementById('user_list_in');
+		var selectOpener = window.opener.document.getElementById('user_list');
+		for (i = 0 ; i < select.length ; i++) {				
+
+			if (select.options[i].selected) {
+				isSelected = false;
+
+				for(var j = 0;j < selectOpener.options.length; j++) {																			
+					if(selectOpener.options[j].value == select.options[i].value){
+						isSelected = true;						
+						break;	
+					}
+				}
+
+				if(!isSelected){
+
+					option = window.opener.document.createElement('option');
+					option.value =select.options[i].value;
+					option.text = select.options[i].text;
+					selectOpener.options[selectOpener.options.length] = option;	
+				}
+				
+			}
+		}
+		selectOpener.options[selectOpener.options.length-1].selected = true;
+ 	}
+	
+// Fim        
Index: /branches/2.0/calendar/templates/classic/js/search.js
===================================================================
--- /branches/2.0/calendar/templates/classic/js/search.js	(revision 1196)
+++ /branches/2.0/calendar/templates/classic/js/search.js	(revision 1196)
@@ -0,0 +1,108 @@
+var searchTimeout;
+
+function lang(key){
+	return document.getElementById("txt_"+key).value;
+}
+
+function remove_user(id){
+	if(!confirm(lang("confirm")))
+		return true;	
+	var handler_rem_user = function(data){
+		if(data) {
+			var tr = document.getElementById(id);
+			tr.parentNode.removeChild(tr);
+		}
+	}	
+	cExecute ('calendar.uigroup_access.rem_user&id='+id, handler_rem_user);
+}
+function add_user(){
+	var select_users = document.getElementById("user");
+	var select_groups = document.getElementById("group");
+	var a_rights = new Array("L","A","E","R","P");
+	var rights = '';
+	for(var z = 0; z < a_rights.length; z++){
+		var check = document.getElementById("right_"+a_rights[z]);
+		if(check.checked){
+			rights += check.value;
+		}
+	}
+	if(!select_users.value){
+		alert(lang("nouser"));
+		return;
+	}
+	else if(!select_groups.value){
+		alert(lang("nogroup"));
+		return;
+	}
+	else if(!rights){
+		alert(lang("nopermissiontype"));
+		return;
+	}
+	
+	var str = select_users.value+";"+select_groups.value;
+	var handler_add_user = function(data){
+		
+		if(data){
+			var t = document.getElementById('tbody_list');
+			var tr = document.createElement("TR");
+			tr.bgColor = "#DCDCDC";
+			var td1 = document.createElement("TD");
+			var td2 = document.createElement("TD");
+			var td3 = document.createElement("TD");
+			var td4 = document.createElement("TD");
+			tr.id = str;
+			td1.innerHTML = "<b>&nbsp;&nbsp;"+select_users[select_users.selectedIndex].text+"</b>";
+			td2.innerHTML = rights;
+			td2.align = "center";
+			td3.innerHTML = "&nbsp;&nbsp;"+select_groups[select_groups.selectedIndex].text;
+			td4.innerHTML = "<button  title='remove' type='button' onClick='javascript:remove_user(\""+str+"\");'><img src='"+document.getElementById("template_set").value+"/images/delete.png' style='vertical-align: middle;'/></button>";
+			tr.appendChild(td1);
+			tr.appendChild(td2);
+			tr.appendChild(td3);
+			tr.appendChild(td4);
+			t.appendChild(tr);
+			alert(lang("success"));
+		}
+		else{
+			alert(lang("exist"));
+		}
+	}
+	cExecute ('calendar.uigroup_access.add_user&id='+str+"&rights="+rights, handler_add_user);
+	return true;
+		
+}
+function search_object(input, id_span, id_select, type)
+{
+	clearTimeout(searchTimeout);	
+	var spam = document.getElementById(id_span);
+	if (input.value.length <= 3){
+		spam.innerHTML = lang("typemoreletters").replace("X",4 - input.value.length);
+	}else{
+		spam.innerHTML = lang("searching")+'...';
+		searchTimeout = setTimeout("search_ldap('"+input.id+"','"+id_span+"','"+id_select+"','"+type+"')",750);
+	}
+}
+
+function search_ldap(id_input, id_span, id_select, type)
+{
+	var search = document.getElementById(id_input).value;
+	
+	var handler_search_user = function(data)
+	{
+		var spam = document.getElementById(id_span);
+		select_available_users = document.getElementById(id_select);
+		if (data.status == 'false')
+		{
+			spam.innerHTML = data.msg;
+			// Necessario, pois o IE6 tem um bug que retira o primeiro options se o innerHTML estiver vazio.
+			select_available_users.innerHTML = '#';
+			select_available_users.outerHTML = select_available_users.outerHTML;
+			return;
+		}	
+		spam.innerHTML = '';
+		// Necessario, pois o IE6 tem um bug que retira o primeiro options se o innerHTML estiver vazio.
+		select_available_users.innerHTML = '#' + data;
+		select_available_users.outerHTML = select_available_users.outerHTML;
+	}
+	cExecute ('calendar.uigroup_access.search_user&search='+search+"&type="+type, handler_search_user);
+}
Index: /branches/2.0/calendar/templates/classic/js/over_fn_exmail.js
===================================================================
--- /branches/2.0/calendar/templates/classic/js/over_fn_exmail.js	(revision 1196)
+++ /branches/2.0/calendar/templates/classic/js/over_fn_exmail.js	(revision 1196)
@@ -0,0 +1,163 @@
+/******************************************************************************\
+|**************************   CALENDAR MODULE   *******************************|
+|********** PLUGIN USING AJAX EXPRESSOMAIL COMPONENT - OVERWRITE FUNCTIONS   **|
+\******************************************************************************/
+
+/******************************************************************************\
+|** Function      : emQuickSearch *********************************************|
+|** Original File : <expressoMail_module>/js/common_functions.js **************|
+\******************************************************************************/
+window.onresize = function(){};
+function emQuickSearch(el){
+
+	var emailList = el.value;
+	var field = el.id;
+	var ex_participants = Element("ex_participants");
+	var quickSearchKeyBegin;
+	var quickSearchKeyEnd;
+	
+	var handler_emQuickSearch = function(data){
+		window_DropDownContacts = Element('tipDiv');
+		if (window_DropDownContacts.style.visibility != 'hidden'){
+			window_DropDownContacts.style.visibility = 'hidden';
+		}
+		
+		if ((!data.status) && (data.error == "many results")){
+			alert(get_lang('More than %1 results. Please, try to refine your search.',200));
+			return false;
+		}
+			
+		if (data.length > 0){
+			QuickCatalogSearch.showList(data, quickSearchKeyBegin, quickSearchKeyEnd);
+		}
+		else
+			alert(get_lang('None result was found.'));
+		return true;
+	}
+	ex_participants.focus(); 				//mecessary for IE.
+	var i = getPosition(ex_participants); //inputBox.selectionStart;
+	var j = --i;
+
+    while ((j >= 0) && (emailList.charAt(j) != ',')){j--};
+    quickSearchKeyBegin = ++j;
+
+    while ((i <= emailList.length) && (emailList.charAt(i) != ',')){i++};
+    quickSearchKeyEnd = i;
+
+    var search_for = trim(emailList.substring(quickSearchKeyBegin, quickSearchKeyEnd));
+
+	if (search_for.length < 4){
+		alert(get_lang('Your search argument must be longer than 4 characters.'));
+		return false;
+	}
+	
+	cExecute ("expressoMail1_2.ldap_functions.quicksearch&search_for="+search_for+"&field="+field, handler_emQuickSearch);
+}
+
+/******************************************************************************\
+|** Function      : emQuickCatalogSearch.prototype.transfer_result ************|
+|** Original File : <expressoMail_module>/js/QuickCatalogSearch.js ************|
+\******************************************************************************/
+emQuickCatalogSearch.prototype.transfer_result = function (field, ID, begin, end){
+	cm = document.getElementById('select_QuickCatalogSearch');
+	option_selected = cm.options[cm.selectedIndex].value + ", ";
+	emailList = Element("ex_participants").value;		
+	new_emailList = emailList.substring(0, begin) + option_selected + emailList.substring((parseInt(end) + 2), emailList.length);
+	document.getElementById("ex_participants").value = new_emailList;
+	if(is_ie)
+		Element("i_blank").style.display = "none";
+	document.getElementById("ex_participants").focus();
+	this.arrayWin['window_QuickCatalogSearch'].close();
+}
+
+/******************************************************************************\
+|** Function      : emQuickCatalogSearch.prototype.close_QuickSearch_window ***|
+|** Original File : <expressoMail_module>/js/QuickCatalogSearch.js ************|
+\******************************************************************************/
+emQuickCatalogSearch.prototype.close_QuickSearch_window = function (field, ID){
+	if(is_ie)
+		Element("i_blank").style.display = "none";
+	document.getElementById("ex_participants").focus();
+	this.arrayWin['window_QuickCatalogSearch'].close();
+}
+
+/******************************************************************************\
+|** Function      : emQuickCatalogSearch.prototype.showWindow *****************|
+|** Original File : <expressoMail_module>/js/QuickCatalogSearch.js ************|
+\******************************************************************************/
+emQuickCatalogSearch.prototype.showWindow = function (div)
+{
+	if(! div) {
+		alert(get_lang('The list has no participant.'));
+		return;
+	}
+						
+	if(! this.arrayWin[div.id]) {
+		div.style.width = "700px";
+		div.style.height = "230px";
+		var title = get_lang('The results were found in the Global Catalog')+':';
+		var wHeight = div.offsetHeight + "px";
+		var wWidth =  div.offsetWidth   + "px";
+		div.style.width = div.offsetWidth - 5;
+
+		win = new dJSWin({			
+			id: 'QuickCatalogSearch_'+div.id,
+			content_id: div.id,
+			width: wWidth,
+			height: wHeight,
+			y:'300px',
+			top: '300px',
+			title_color: '#3978d6',
+			bg_color: '#eee',
+			title: title,						
+			title_text_color: 'white',
+			button_x_img: 'phpgwapi/images/winclose.gif',
+			border: true });
+		
+		this.arrayWin[div.id] = win;
+		win.draw();
+	}
+	else {
+		win = this.arrayWin[div.id];
+	}
+
+	if(is_ie) {	
+		var _IFrame = Element("i_blank");
+		if(_IFrame){
+    		_IFrame.style.display  = '' ;		
+		}
+		else {
+			_IFrame = document.body.appendChild(document.createElement('iframe'));
+			_IFrame.src = 'about:blank' ;
+		    _IFrame.frameBorder		= '0';
+		    _IFrame.scrolling		= 'no' ;
+		    _IFrame.style.left		= findPosX(div)  + document.body.scrollLeft -5;
+			_IFrame.style.top		= findPosY(div)  + document.body.scrollTop  -20;
+		    _IFrame.width			= 610;
+   		    _IFrame.style.border	= 0;
+			_IFrame.height			= 285;
+			_IFrame.border			= 0;
+			_IFrame.id				= "i_blank";
+		    _IFrame.style.position	= 'absolute';
+	   	    _IFrame.style.zIndex	= '5';
+    		_IFrame.style.display  = '' ;
+		}
+	}
+
+	win.open();
+	document.getElementById('select_QuickCatalogSearch').focus();
+}	
+
+
+/******************************************************************************\
+|** Function      :  DRAG *****************************************************|
+|** Original File : phpgwapi/js/wz_dragdrop/wz_dragdrop.js ********************|
+\******************************************************************************/
+var over_fn_DRAG = DRAG;
+DRAG = function (event){
+
+		if(is_ie)
+			return false;
+		else
+			over_fn_DRAG(event);
+}		
Index: /branches/2.0/expressoMail1_2/templates/classic/preferences.tpl
===================================================================
--- /branches/2.0/expressoMail1_2/templates/classic/preferences.tpl	(revision 1196)
+++ /branches/2.0/expressoMail1_2/templates/classic/preferences.tpl	(revision 1196)
@@ -0,0 +1,259 @@
+<script src="js/main.js"></script>
+<center>
+<script language="JavaScript" type="text/javascript">
+<!--
+  function exibir_ocultar(situacao)
+  {
+     var xtr1 = document.getElementById('tr01');
+     var xtr2 = document.getElementById('tr02');
+     var xc1 = document.getElementById('c01');
+     var xc2 = document.getElementById('c02');
+     if(situacao==true)
+       {
+    xtr1.style.display='';
+    xtr2.style.display='';
+    xc1.checked=false;
+    xc2.checked=false;
+       }
+      else
+       {
+    xtr1.style.display='none';
+    xtr2.style.display='none';
+    xc1.checked=false;
+    xc2.checked=false;
+       }
+  }
+ -->
+</script> 
+<table width="65%" border="0" cellspacing="2" cellpadding="2">
+
+<form  method="POST" action="{save_action}" onSubmit="selectValues()">
+<input type="hidden" name="try_saved" value="false">
+    <tr bgcolor="{th_bg}">
+        <td colspan="2" align="center">{lang_config_expressoMail}</td>
+    </tr>
+    <tr bgcolor="{tr_color1}">
+        <td>{lang_max_emails_per_page}</td>
+        <td align="center">
+			<select name="max_emails_per_page">
+				<option {option_25_selected} value="25">25</option>
+				<option {option_50_selected} value="50">50</option>
+				<option {option_75_selected} value="75">75</option>
+				<option {option_100_selected} value="100">100</option>
+			</select>
+        </td>
+    </tr>
+    <tr bgcolor="{tr_color2}">
+        <td>{lang_save_deleted_msg}</td>
+        <td align="center">
+        	<input type="checkbox" name="save_deleted_msg" value=1 {checked_save_deleted_msg}>
+        </td>
+    </tr>
+    <tr bgcolor="{tr_color1}">
+        <td>{lang_delete_trash_messages_after_n_days}</td>
+        <td align="center">
+			<select name="delete_trash_messages_after_n_days">
+				<option {delete_trash_messages_option_0_selected} value="0">{lang_none}</option>
+				<option {delete_trash_messages_option_1_selected} value="1">{one_day}</option>
+				<option {delete_trash_messages_option_2_selected} value="2">{two_days}</option>
+				<option {delete_trash_messages_option_3_selected} value="3">{three_days}</option>
+				<option {delete_trash_messages_option_4_selected} value="4">{four_days}</option>
+				<option {delete_trash_messages_option_5_selected} value="5">{five_days}</option>
+			</select>
+        </td>
+    </tr>
+    {open_comment_local_messages_config}
+	<tr bgcolor="{tr_color2}">
+        <td>{lang_Would_you_like_to_use_local_messages_?}</td>
+        <td align="center">
+        	<select name="use_local_messages" id="use_local_messages" onchange="disable_field(document.getElementById('keep_archived_messages'),'document.getElementById(\'use_local_messages\').value==\'0\'')">
+				<option {use_local_messages_option_No_selected} value="0">{lang_No}</option>
+				<option {use_local_messages_option_Yes_selected} value="1">{lang_Yes}</option>
+			</select>
+        </td>
+    </tr>
+	<tr bgcolor="{tr_color1}">
+        <td>{lang_Would_you_like_to_keep_archived_messages_?}</td>
+        <td align="center">
+        	<select name="keep_archived_messages" id="keep_archived_messages">				
+				<option {keep_archived_messages_option_No_selected} value="0">{lang_No}</option>
+				<option {keep_archived_messages_option_Yes_selected} value="1">{lang_Yes}</option>
+			</select>
+        </td>
+    </tr>
+    {close_comment_local_messages_config}
+    <tr bgcolor="{tr_color2}">
+        <td>{lang_delete_and_show_previous_message}</td>
+        <td align="center">
+        	<input type="checkbox" name="delete_and_show_previous_message" value=1 {checked_delete_and_show_previous_message}>
+        </td>
+    </tr>
+	<tr bgcolor="{tr_color1}">
+        <td>{lang_alert_new_msg}</td>
+        <td align="center">
+        	<input type="checkbox" name="alert_new_msg" value=1 {checked_alert_new_msg}>
+        </td>
+    </tr>
+    <tr bgcolor="{tr_color2}">
+        <td>{lang_hook_home}</td>
+        <td align="center">
+        	<input type="checkbox" name="mainscreen_showmail" value=1 {checked_mainscreen_showmail}>
+        </td>
+    </tr>
+    <tr bgcolor="{tr_color1}">
+        <td>{lang_save_in_folder}</td>
+        <td align="center">
+        	<select name="save_in_folder">{value_save_in_folder}</select>
+        </td>
+    </tr>
+    <tr bgcolor="{tr_color2}">
+        <td>{lang_hide_menu}</td>
+        <td align="center">
+			<input type="checkbox" name="check_menu" value=1 {checked_menu}>
+        </td>
+    </tr>
+    <tr bgcolor="{tr_color1}">
+        <td>{lang_line_height}</td>
+        <td align="center">
+			<select name="line_height">
+				<option {line_height_option_20_selected} value="20">{normal}</option>
+				<option {line_height_option_30_selected} value="30">{medium}</option>
+				<option {line_height_option_40_selected} value="40">{big}</option>
+			</select>
+        </td>
+    </tr>
+    <tr bgcolor="{tr_color2}">
+        <td>{lang_font_size}</td>
+        <td align="center">
+			<select name="font_size">
+				<option {font_size_option_10_selected} value="10">{small}</option>
+				<option {font_size_option_11_selected} value="11">{normal}</option>
+				<option {font_size_option_15_selected} value="15">{big}</option>
+			</select>
+        </td>
+    </tr>
+    <tr bgcolor="{tr_color1}">
+        <td>{lang_use_dynamic_contacts}</td>
+        <td align="center">
+			<input type="checkbox" name="use_dynamic_contacts" value=1 {checked_dynamic_contacts}>
+        </td>
+    </tr>
+    <tr bgcolor="{tr_color2}">
+        <td>
+			{lang_use_shortcuts}
+		</td>
+		<td align="center">
+			<input type="checkbox" name="use_shortcuts" value=1 {checked_shortcuts}>
+		</td>
+    </tr>
+
+    <tr bgcolor="{tr_color1}">
+        <td>
+			{lang_auto_save_draft}
+		</td>
+		<td align="center">
+			<input type="checkbox" name="auto_save_draft" value=1 {checked_auto_save_draft}>
+		</td>
+    </tr>
+    <tr bgcolor="{th_bg}">
+        <td colspan="2" align="center">{lang_config_signature}</td>
+    </tr>
+    <tr bgcolor="{tr_color2}"  {display_digital_cripto}>
+        <td>
+			{lang_use_signature_digital_cripto}
+		</td>
+		<td align="center">
+			<input type="checkbox" name="use_signature_digital_cripto" value=1 {checked_use_signature_digital_cripto} onClick="javascript:exibir_ocultar(this.checked)">
+		</td>
+    </tr>
+
+    <tr  bgcolor="{tr_color1}" id="tr01" {display_digital}>
+	<td>
+			{lang_use_signature_digital}
+		</td>
+		<td  align="center" >
+			 <input id="c01" type="checkbox" name="use_signature_digital" value=1 {checked_use_signature_digital}>
+		</td>
+    </tr>
+
+    <tr bgcolor="{tr_color2}" id="tr02" {display_cripto} >
+	<td>
+			{lang_use_signature_cripto}
+		</td>
+		<td  align="center">
+			 <input id="c02" type="checkbox" name="use_signature_cripto" value=1 {checked_use_signature_cripto}>
+		</td>
+    </tr>
+
+     <tr bgcolor="{tr_color1}">
+        <td>
+			{lang_use_signature}
+		</td>
+		<td align="center">
+			<input type="checkbox" name="use_signature" value=1 {checked_use_signature}>
+		</td>
+    </tr>
+    <tr bgcolor="{tr_color2}">
+        <td valign="center">
+			{lang_type_signature}
+        </td>
+        <td align="center">
+			<select id="type_signature" name="type_signature" onChange="javascript:changeTypeSignature(this.value)">
+				<option {type_signature_option_text_selected} value="text">{simple_text}</option>
+				<option {type_signature_option_html_selected} value="html">{html_text}</option>
+			</select>
+		</td>
+    </tr>
+    <tr bgcolor="{tr_color2}">
+        <td colspan='2' valign="center" id="td_html_signature" style="{type_signature_td_html}">
+			{rtf_signature}
+        </td>
+    </tr>
+     <tr bgcolor="{tr_color2}">
+        <td colspan='2' align="center" id="td_text_signature"  style="{type_signature_td_text}">
+			<textarea name='text_signature' rows='4' cols='70'>{text_signature}</textarea>
+        </td>
+    </tr>
+    <tr bgcolor="{th_bg}">
+    	<td colspan="2" >
+    		<table width="100%" border="0" cellspacing="2" cellpadding="2">
+    			<tr>
+        			<td align="left">
+        				<input type="button" name="cancel" value="{lang_cancel}" onClick="javascript:document.location.href = '../expressoMail1_2/index.php'">
+        			</td>
+        			<td align="right">
+        				<input type="submit" name="submit" value="{lang_save}" onClick="try_saved.value='true';">
+        			</td>
+        		</tr>
+        </td>
+    </tr>
+
+</table>
+</center>
+<script language="JavaScript" type="text/javascript">
+	if(document.getElementById('keep_archived_messages'))
+		disable_field(document.getElementById('keep_archived_messages'),'document.getElementById(\'use_local_messages\').value==\'0\'')
+	var form = 	document.forms[0];
+
+	function selectValues(){
+		var signature = eval("form."+form.type_signature.value+"_signature");
+		signature.name = "signature";
+		return true;
+	} 	
+
+	function changeTypeSignature(value){
+		var html_signature = FCKeditorAPI.GetInstance("html_signature");
+
+  		if(value == 'text'){
+			form.text_signature.value = html_signature.GetHTML();
+  	  		document.getElementById("td_text_signature").style.display = '';
+	  	  	document.getElementById("td_html_signature").style.display = 'none';
+  		}
+	  	else if(value == 'html'){
+  		  	html_signature.SetHTML(form.text_signature.value);
+  		  	document.getElementById("td_text_signature").style.display = 'none';
+  	  		document.getElementById("td_html_signature").style.display  = '';
+	  	}
+	  	
+	}
+</script>  
Index: /branches/2.0/expressoMail1_2/templates/classic/offline_preferences.tpl
===================================================================
--- /branches/2.0/expressoMail1_2/templates/classic/offline_preferences.tpl	(revision 1196)
+++ /branches/2.0/expressoMail1_2/templates/classic/offline_preferences.tpl	(revision 1196)
@@ -0,0 +1,55 @@
+<div style="display:none" id="loading">
+	<table width="100%" height="100%">
+		<tr>
+			<td background="js/modal/images/fundo_exp.png" valign="top" align="center">
+				<font color="#006699"><b><div id="text_loading">Instalando módulo offline... aguarde!!</div></b></font>
+			</td>
+		</tr>
+	</table>
+</div>
+<input type="hidden" id="lang_gears_redirect" value="{lang_gears_redirect}" />
+<input type="hidden" id="lang_offline_installed" value="{lang_offline_installed}" />
+<input type="hidden" id="lang_offline_uninstalled" value="{lang_offline_uninstalled}" />
+<input type="hidden" id="lang_only_spaces_not_allowed" value="{lang_only_spaces_not_allowed}"/>
+
+
+<script src="js/main.js"></script>
+<script src="js/gears_init.js"></script>
+<script src="js/local_messages.js"></script>
+<script src="js/modal/modal.js"></script>
+<script src="js/md5.js"></script>
+
+<script language="javascript">
+	var close_lightbox_div = true;
+
+</script>
+<center>
+
+<table width="50%" border="0" cellspacing="2" cellpadding="2">
+	<tr bgcolor="{th_bg}">
+        <td colspan="2" align="center">{lang_expresso_offline}</td>
+    </tr>
+	<tr bgcolor="{tr_color1}">
+        <td width="25%">
+			{lang_pass_offline}:
+		</td>
+        <td>
+        	<input type="password" name="offline_pass" id='offline_pass'>
+        </td>
+    </tr>
+    <tr>
+    	<td colspan="2">
+			<table width="100%" border="0" cellspacing="2" cellpadding="2">
+	    		<tr>
+	        		<td align="center" >
+	        			<input type="button" name="install_off" value="{lang_install_offline}" onclick="close_lightbox_div=true;expresso_local_messages.install_offline('{url_offline}','{url_icon}','{user_uid}','{user_login}',MD5(document.getElementById('offline_pass').value),'{go_back}');">
+	        		</td>
+	        		<!--td align="right" width="50%">
+	        			<input type="button" name="install_off" value="{lang_uninstall_offline}" onclick="expresso_local_messages.uninstall_offline()">
+	        		</td-->
+	        	</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+</center>
Index: /branches/2.0/expressoMail1_2/templates/classic/config.tpl
===================================================================
--- /branches/2.0/expressoMail1_2/templates/classic/config.tpl	(revision 1196)
+++ /branches/2.0/expressoMail1_2/templates/classic/config.tpl	(revision 1196)
@@ -0,0 +1,107 @@
+<!-- BEGIN header -->
+<form method="POST" action="{action_url}">
+<table border="0" align="center">
+   <tr bgcolor="{th_bg}">
+    <td colspan="2"><font color="{th_text}">&nbsp;<b>{title}</b></font></td>
+   </tr>
+<!-- END header -->
+<!-- BEGIN body -->
+   <tr bgcolor="{row_on}">
+    <td colspan="2">&nbsp;</td>
+   </tr>
+   <tr bgcolor="{row_off}">
+    <td colspan="2"><b>{lang_ExpressoMail_settings}</b></td>
+   </tr>
+	<tr class="{row_off}">
+    <td>{lang_Would_you_like_to_use_local_messages_?}:</td>
+    <td>
+     <select name="newsettings[enable_local_messages]">
+      <option value="">{lang_No}</option>
+      <option value="True"{selected_enable_local_messages_True}>{lang_Yes}</option>
+     </select>
+    </td>
+   </tr>
+   <tr bgcolor="{row_on}">
+    <td>{lang_Do_you_want_to_log_the_sent_messages?}</td>
+    <td>
+     <select name="newsettings[expressoMail_enable_log_messages]">
+      <option value=""{selected_expressoMail_enable_log_messages_False}>{lang_No}</option>
+      <option value="True"{selected_expressoMail_enable_log_messages_True}>{lang_Yes}</option>
+     </select>&nbsp;&nbsp;&nbsp;path: /home/expresso/mail_senders.log
+    </td>
+   </tr>
+   <tr bgcolor="{row_off}">
+   <td>{lang_Do_you_want_to_cache_php_requests_in_javascript?}</td>
+   <td>
+   <select name="newsettings[expressoMail_enable_cache]">
+   <option value=""{selected_expressoMail_enable_cache_False}>{lang_No}</option>
+   <option value="True"{selected_expressoMail_enable_cache_True}>{lang_Yes}</option>
+   </select>
+   </td>
+   </tr>
+   <tr bgcolor="{row_on}">
+   <td>{lang_Do_you_want_to_use_important_flag_in_email_editor?}</td>
+   <td>
+   <select name="newsettings[expressoMail_enable_important_flag]">
+   <option value=""{selected_expressoMail_enable_important_flag_False}>{lang_No}</option>  
+   <option value="True"{selected_expressoMail_enable_important_flag_True}>{lang_Yes}</option>
+   </select>
+   </td>
+   </tr>
+   <tr bgcolor="{row_off}">
+   <td>{lang_Do_you_want_to_use_remove_attachments_function?}</td>
+   <td>
+   <select name="newsettings[expressoMail_remove_attachments_function]">
+   <option value=""{selected_expressoMail_remove_attachments_function_False}>{lang_No}</option>
+   <option value="True"{selected_expressoMail_remove_attachments_function_True}>{lang_Yes}</option>
+   </select>
+   </td>
+   </tr>
+   <tr bgcolor="{row_on}">
+   <td>{lang_Do_you_want_to_use_the_spam_filter?}</td>
+   <td>
+   <select name="newsettings[expressoMail_use_spam_filter]">
+   <option value=""{selected_expressoMail_use_spam_filter_False}>{lang_No}</option>
+   <option value="True"{selected_expressoMail_use_spam_filter_True}>{lang_Yes}</option>
+   </select>
+    </td>
+   </tr>
+   <tr bgcolor="{row_off}">
+    <td>{lang_Command_for_spam}</td>
+    <td>
+    <input type="text" name="newsettings[expressoMail_command_for_spam]" value="{value_expressoMail_command_for_spam}" size="60" /> 
+    </td>
+    <tr bgcolor="{row_on}">
+    <td>{lang_Command_for_unmark_spam}</td>
+    <td>
+    <input size="60" name="newsettings[expressoMail_command_for_ham]" value="{value_expressoMail_command_for_ham}"> 
+    </td>
+    </tr>
+    <tr bgcolor="{row_off}">
+    <td>{lang_Always_confirm_notification_to_these_domains}</td>
+    <td>
+    <input size="60" name="newsettings[expressoMail_notification_domains]" value="{value_expressoMail_notification_domains}">
+    </td>
+    </tr>
+    <tr bgcolor="{row_on}">
+    <td>{lang_Number_of_dynamic_contacts}</td>
+    <td>
+    <input size="1" name="newsettings[expressoMail_Number_of_dynamic_contacts]" value="{value_expressoMail_Number_of_dynamic_contacts}"> 
+    </td>
+    </tr>
+<!-- END body -->
+<!-- BEGIN footer -->
+  <tr bgcolor="{th_bg}">
+    <td colspan="2">
+&nbsp;
+    </td>
+  </tr>
+  <tr>
+    <td colspan="2" align="center">
+      <input type="submit" name="submit" value="{lang_submit}">
+      <input type="submit" name="cancel" value="{lang_cancel}">
+    </td>
+  </tr>
+</table>
+</form>
+<!-- END footer -->
Index: /branches/2.0/expressoMail1_2/templates/classic/index.tpl
===================================================================
--- /branches/2.0/expressoMail1_2/templates/classic/index.tpl	(revision 1196)
+++ /branches/2.0/expressoMail1_2/templates/classic/index.tpl	(revision 1196)
@@ -0,0 +1,102 @@
+<!-- BEGIN list -->
+<input type="hidden" value="{txt_loading}" id="txt_loading">
+<input type="hidden" value="{txt_clear_trash}" id="txt_clear_trash">
+<input type="hidden" value="{upload_max_filesize}" id="upload_max_filesize">
+<input type="hidden" value="{msg_folder}" id="msg_folder">
+<input type="hidden" value="{msg_number}" id="msg_number">
+<input type="hidden" value="{user_email}" id="user_email">
+<input type="hidden" value="{user_organization}" id="user_organization">
+<input type="hidden" value="{cyrus_delimiter}" id="cyrus_delimiter">
+<table id="main_table" width="100%" cellspacing="0" cellpadding="0" border="0" style="display:none">
+	<tbody>
+		<tr>
+			<td id="folderscol" width="162px" height="100%" valign="top">			
+				<table id="folders_tbl" width="162px" border="0" cellspacing="0" cellpadding="0" border="0">
+					<tbody>
+						<tr><td><div class='content-menu'>
+							<table border="0" cellspacing="0" cellpadding="0" border="0"><tbody>
+								<tr><td class='content-menu-td' onclick='javascript:new_message("new","null");' onmouseover='javascript:set_menu_bg(this);' onmouseout='javascript:unset_menu_bg(this);'><div class='em_div_sidebox_menu'><img src='./templates/default/images/menu/createmail.gif'><span class="em_sidebox_menu">{new_message}</span></div></td></tr>
+								<tr><td class='content-menu-td' id='em_refresh_button' onclick='javascript:refresh();' onmouseover='javascript:set_menu_bg(this);' onmouseout='javascript:unset_menu_bg(this);'><div class='em_div_sidebox_menu'><img src='./templates/default/images/menu/checkmail.gif'><span class="em_sidebox_menu">{refresh}</span></div></td></tr>
+								<tr><td id="link_tools" class='content-menu-td' onmouseover='javascript:set_menu_bg(Element("link_tools"));' onmouseout='javascript:unset_menu_bg(this);'><div class='em_div_sidebox_menu'><img height='16px' src='./templates/default/images/menu/tools.gif'><span class="em_sidebox_menu">{tools} ...</span></div></td></tr>								
+							</tbody></table>
+						</div></td></tr>
+						<tr><td height="2px"></td></tr>						
+						<tr><td class="content-folders" valign="top" style="padding:2px">
+							<div id="content_folders" style="height:100%;width:170px;overflow:auto"></div>
+						</td></tr>
+					</tbody>
+				</table>
+				<div style="height:4px"></div>
+				<div id="search_div" align="center" style="white-space:nowrap">
+					<input type="text" id="em_message_search" size="16" maxlength="22" onfocus="javascript:onFocusQuickSearchEmail(this); return false;"/>
+					<a class='' onMouseOut="window.status='';return true;" title='{lang_Open_Search_Window}' onMouseOver="window.status='{lang_Open_Search_Window}';return true;" href="javascript:void(0);"  onClick="javascript:search_emails(Element('em_message_search').value)">
+						<img valign="center" align="center" src="templates/default/images/search.gif">
+					</a>
+					<a class='' onMouseOut="window.status='';return true;" title='{lang_search_user}' onMouseOver="window.status='{lang_search_user}' ;return true;" href="javascript:void(0);"  onClick="javascript:emQuickSearch(Element('em_message_search').value, 'null', 'null')">
+						<img valign="center" align="center" src="templates/default/images/users.jpg">
+					</a>
+				</div>
+				<script type="text/javascript">
+					
+					var element_input = document.getElementById('em_message_search');
+				
+					function keyPressQuickSearchEmail(e)
+					{
+						if( e.keyCode == 13 )
+							emQuickSearch(Element('em_message_search').value, 'null', 'null');
+					}
+
+					if ( element_input.addEventListener )
+						element_input.addEventListener('keypress', keyPressQuickSearchEmail, false);
+					else if ( element_input.attachEvent )
+						element_input.attachEvent('onkeypress', keyPressQuickSearchEmail);
+
+					function onFocusQuickSearchEmail(pInput)
+					{
+						if ( pInput.createTextRange )
+						{
+							var FieldRange = pInput.createTextRange();
+								FieldRange.moveStart('character', pInput.value.length);
+								FieldRange.collapse();
+								FieldRange.select();
+						}
+					}
+				
+				</script>
+			</td>
+			<td width="2px">&nbsp;</td>			
+			<td width="*" valign="top" align="left">
+				<div id="exmail_main_body" class="messagescol">
+					<table id="border_table" width="auto" height="26" cellspacing="0" cellpadding="0" border="0">
+						<tbody id="border_tbody">
+							<tr id="border_tr">
+								<td nowrap class="menu" onClick="alternate_border(0);"  id="border_id_0">&nbsp;{lang_inbox}&nbsp;<font face="Verdana" size="1" color="#505050">[<span id="new_m">0</span> / <span id="tot_m">0</span>]</font>
+								</td>
+								<td nowrap id="border_blank" class="last_menu" width="100%">&nbsp;</td>								
+							</tr>
+						</tbody>
+					</table>
+					<div id="content_id_0" class="conteudo"></div>
+					<div id="footer_menu">
+						<table style="border-top:0px solid black" id="footer_box" cellpadding=0 cellspacing=0 border=0 width="100%" height="10px">
+							<tbody>
+								<tr id="table_message"></tr>
+							</tbody>
+						</table>
+					</div>
+				</div>
+			</td>
+		</tr>
+	</tbody>
+</table>
+<div id='forms_queue'></div>
+<div style="display:none" id="send_queue">
+	<table width="100%" height="100%">
+		<tr>
+			<td background="js/modal/images/fundo_exp.png" valign="top" align="center">
+				<font color="#006699"><b><div id="text_send_queue"></div></b></font>
+			</td>
+		</tr>
+	</table>
+</div>
+<!-- END list -->
Index: /branches/2.0/expressoMail1_2/templates/classic/index_offline.tpl
===================================================================
--- /branches/2.0/expressoMail1_2/templates/classic/index_offline.tpl	(revision 1196)
+++ /branches/2.0/expressoMail1_2/templates/classic/index_offline.tpl	(revision 1196)
@@ -0,0 +1,96 @@
+<!-- BEGIN list -->
+<input type="hidden" value="{txt_loading}" id="txt_loading">
+<input type="hidden" value="{txt_clear_trash}" id="txt_clear_trash">
+<input type="hidden" value="{upload_max_filesize}" id="upload_max_filesize">
+<input type="hidden" value="{msg_folder}" id="msg_folder">
+<input type="hidden" value="{msg_number}" id="msg_number">
+<input type="hidden" value="{user_email}" id="user_email">
+<input type="hidden" value="{user_organization}" id="user_organization">
+<input type="hidden" value="{cyrus_delimiter}" id="cyrus_delimiter">
+<table id="main_table" width="100%" cellspacing="0" cellpadding="0" border="0" style="display:none">
+	<tbody>
+		<tr>
+			<td id="folderscol" width="162px" height="100%" valign="top">			
+				<table id="folders_tbl" width="162px" border="0" cellspacing="0" cellpadding="0" border="0">
+					<tbody>
+						<tr><td><div class='content-menu'>
+							<table border="0" cellspacing="0" cellpadding="0" border="0"><tbody>
+								<tr><td class='content-menu-td' onclick='javascript:new_message("new","null");' onmouseover='javascript:set_menu_bg(this);' onmouseout='javascript:unset_menu_bg(this);'><div class='em_div_sidebox_menu'><img src='./templates/{template}/images/menu/createmail.gif'><span class="em_sidebox_menu">{new_message}</span></div></td></tr>
+								<!--tr><td class='content-menu-td' id='em_refresh_button' onclick='javascript:refresh();' onmouseover='javascript:set_menu_bg(this);' onmouseout='javascript:unset_menu_bg(this);'><div class='em_div_sidebox_menu'><img src='./templates/{template}/images/menu/checkmail.gif'><span class="em_sidebox_menu">{refresh}</span></div></td></tr-->
+
+								<tr><td id="link_tools" class='content-menu-td' onmouseover='javascript:set_menu_bg(Element("link_tools"));' onmouseout='javascript:unset_menu_bg(this);'><div class='em_div_sidebox_menu'><img height='16px' src='./templates/{template}/images/menu/tools.gif'><span class="em_sidebox_menu">{tools} ...</span></div></td></tr>								
+								<tr><td class='content-menu-td' onclick='expresso_offline_access.do_logoff()' onmouseover='javascript:set_menu_bg(this);' onmouseout='javascript:unset_menu_bg(this);'><div class='em_div_sidebox_menu'><img width='18px' height='18px' src='../phpgwapi/templates/celepar/images/logout.png'><span class="em_sidebox_menu">{logoff}</span></div></td></tr>
+								<tr><td height="3px">&nbsp;</td></tr>								
+							</tbody></table>
+						</div></td></tr>
+						<tr><td height="2px"></td></tr>						
+						<tr><td class="content-folders" valign="top" style="padding:2px">
+							<div id="content_folders" style="height:100%;width:162px;overflow:auto"></div>
+						</td></tr>
+					</tbody>
+				</table>
+				<div style="height:4px"></div>
+				<div align="center">
+					<input type="text" id="em_message_search" size="16" maxlength="22" onfocus="javascript:onFocusQuickSearchEmail(this); return false;"/>
+					<a class='' onMouseOut="window.status='';return true;" title='{lang_Open_Search_Window}' onMouseOver="window.status='{lang_Open_Search_Window}';return true;" href="javascript:void(0);"  onClick="javascript:search_emails(Element('em_message_search').value)">
+						<img valign="center" align="center" src="templates/{template}/images/search.gif">
+					</a>
+					<!--a class='' onMouseOut="window.status='';return true;" title='{lang_search_user}' onMouseOver="window.status='{lang_search_user}' ;return true;" href="javascript:void(0);"  onClick="javascript:emQuickSearch(Element('em_message_search').value, 'null', 'null')">
+						<img valign="center" align="center" src="templates/{template}/images/users.jpg">
+					</a-->
+				</div>
+				<script type="text/javascript">
+					
+					var element_input = document.getElementById('em_message_search');
+				
+					function keyPressQuickSearchEmail(e)
+					{
+						if( e.keyCode == 13 )
+							search_emails(element_input.value);
+					}
+
+					if ( element_input.addEventListener )
+						element_input.addEventListener('keypress', keyPressQuickSearchEmail, false);
+					else if ( element_input.attachEvent )
+						element_input.attachEvent('onkeypress', keyPressQuickSearchEmail);
+
+					function onFocusQuickSearchEmail(pInput)
+					{
+						if ( pInput.createTextRange )
+						{
+							var FieldRange = pInput.createTextRange();
+								FieldRange.moveStart('character', pInput.value.length);
+								FieldRange.collapse();
+								FieldRange.select();
+						}
+					}
+				
+				</script>
+			</td>
+			<td width="2px">&nbsp;</td>			
+			<td width="*" valign="top" align="left">
+				<div id="exmail_main_body" class="messagescol">
+					<table id="border_table" width="auto" height="26" cellspacing="0" cellpadding="0" border="0">
+						<tbody id="border_tbody">
+							<tr id="border_tr">
+								<td nowrap class="menu" onClick="alternate_border(0);"  id="border_id_0">&nbsp;{lang_inbox}&nbsp;<font face="Verdana" size="1" color="#505050">[<span id="new_m">0</span> / <span id="tot_m">0</span>]</font>
+								</td>
+								<td nowrap id="border_blank" class="last_menu" width="100%">&nbsp;</td>								
+							</tr>
+						</tbody>
+					</table>
+					<div id="content_id_0" class="conteudo"></div>
+					<div id="footer_menu">
+						<table style="border-top:0px solid black" id="footer_box" cellpadding=0 cellspacing=0 border=0 width="100%" height="10px">
+							<tbody>
+								<tr id="table_message"></tr>
+							</tbody>
+						</table>
+					</div>
+				</div>
+			</td>
+		</tr>
+	</tbody>
+</table>
+
+<!-- END list -->
Index: /branches/2.0/expressoMail1_2/templates/classic/import.tpl
===================================================================
--- /branches/2.0/expressoMail1_2/templates/classic/import.tpl	(revision 1196)
+++ /branches/2.0/expressoMail1_2/templates/classic/import.tpl	(revision 1196)
@@ -0,0 +1,30 @@
+
+<center>
+
+<table width="50%" border="0" cellspacing="2" cellpadding="2">
+
+<form method="POST" action="{save_action}" enctype="multipart/form-data">
+    <tr bgcolor="{th_bg}">
+        <td colspan="2" align="center">{lang_import}</td>
+    </tr>
+    <tr bgcolor="{tr_color1}">
+        <td>{lang_file}:</td>
+        <td align="center">
+			<input type="file" name="arquivo">
+        </td>
+    </tr>
+    <tr bgcolor="{th_bg}">
+    	<td colspan="2" >
+    		<table width="100%" border="0" cellspacing="2" cellpadding="2">
+    			<tr>
+        			<td align="left">
+        				<input type="button" name="cancel" value="{lang_cancel}" onClick="javascript:document.location.href = '../expressoMail1_2/index.php'">
+        			</td>
+        			<td align="right">
+        				<input type="submit" name="submit" value="{lang_save}">
+        			</td>        			
+        		</tr>
+        </td>        
+    </tr>
+</table>
+</center>
Index: /branches/2.0/expressoMail1_2/templates/classic/login_offline.tpl
===================================================================
--- /branches/2.0/expressoMail1_2/templates/classic/login_offline.tpl	(revision 1196)
+++ /branches/2.0/expressoMail1_2/templates/classic/login_offline.tpl	(revision 1196)
@@ -0,0 +1,130 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<HTML>
+<!-- BEGIN login_form -->
+<HEAD>
+<META http-equiv="Content-Type" content="text/html; charset={charset}">
+<META name="AUTHOR" content="dGroupWare http://www.eGroupWare.org">
+<META NAME="description" CONTENT="{website_title} login screen, working environment powered by eGroupWare">
+<META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW">
+<META NAME="keywords" CONTENT="{website_title} login screen, eGroupWare, groupware, groupware suite">
+<link href="../phpgwapi/templates/celepar/login.css" rel="stylesheet" type="text/css">
+<TITLE>{website_title} - {lang_login}</TITLE>
+<script src="js/local_messages.js?1.222" type='text/javascript'></script>
+<script src="js/offline_access.js?1.222" type='text/javascript'></script>
+<script src="js/gears_init.js?1.222" type='text/javascript'></script>
+<script src="js/md5.js?1.222" type='text/javascript'></script>
+<script language="Javascript">
+<!--
+	
+	function submitIt(event){
+		/*if(event.keyCode == 13)
+			document.login.submit();*/		
+	}
+
+	function setLogin(){
+		if( document.login.organization != null)
+			document.login.login.value = document.login.organization.value+'-'+document.login.user.value;
+		else
+			document.login.login.value = document.login.user.value;			
+	}
+	
+	function getLogin(){
+		var cookie = '{cookie}';
+		if( document.login.organization != null)
+			document.login.user.value= cookie.substring(cookie.indexOf('-')+1,cookie.length);
+		else	
+			document.login.user.value= cookie;
+
+		if(document.login.user.value == '') {
+			if(document.login.organization != null)
+				document.login.organization.focus();
+			else
+				document.login.user.focus();
+		}
+		else
+			document.login.passwd.focus();
+	}
+	
+ 	function openWindow(newWidth,newHeight,link) {					
+		newScreenX  = screen.width - newWidth;	
+		newScreenY  = 0;		
+		Window1=window.open(link,'',"width="+newWidth+",height="+newHeight+",screenX="+newScreenX+",left="+newScreenX+",screenY="+newScreenY+",top="+newScreenY+",toolbar=no,scrollbars=yes,resizable=no");				
+	}
+	
+	-->
+</script>
+</HEAD>
+<body scroll="no"  style="overflow:hidden"  bgcolor="#ffffff" onload="expresso_offline_access.fill_combo_of_users(document.getElementById('users_combo'))">
+<table border="0" height="100%" width="100%">
+<tr><td align="center" valign="center">
+<table align="center" border="1" bordercolor="#cfcfcf" cellpadding="0" cellspacing="0" width="100%"  height="100%">
+<tbody><tr>
+    <td  height="100%">
+<table cellpadding="0" cellspacing="0" width="100%"  height="100%">
+	<tbody><tr>			
+    <td bgcolor="#E8EEF7"  height="100%">
+    <table cellpadding="0" height="100%" cellspacing="0" width="100%" border="0"><tr><td width="60%">&nbsp;</td><td>
+	<div align="center" id='div_error' class="msgInicial">{cd}<br>{lang_message}<br>{website_title} - 01<br><br></div>
+        <table border="0" bordercolor="#cfcfcf" cellpadding="0" cellspacing="0" width="300">
+          <tbody><tr>
+				<FORM name="login" method="post" action="{login_url}" {autocomplete} onsubmit="expresso_offline_access.do_login(document.getElementById('users_combo').value,MD5(document.getElementById('passwd').value));return false;">
+            	<td bgcolor="#f7f7f7" style="border:1px solid black">
+					<table  border="0" cellpadding="0" cellspacing="0" class="tableLogin">
+						<tr><td height="2px">&nbsp;</td></tr>
+					  <tr>
+						<td width="96" class="loginLabel">{lang_username}:&nbsp;</td>
+						<td width="105"><select name="user" id='users_combo'></select><!--input name="user" size="20"--></td>
+						<td width="43" rowspan="3"><img src="../phpgwapi/templates/celepar/images/icon_login.gif" width="43" height="64"></td>
+					  </tr>
+					  <tr>
+						<td width="66" class="loginLabel">{lang_password}:&nbsp;</td>
+						<td width="135"><input name="passwd" type="password" size="20" id="passwd"></td>
+						<td>&nbsp;</td>		
+					  </tr>
+					  <tr>
+						<td width="66">&nbsp;</td>
+						<td width="135">
+						  <input type="button" value="{lang_login}" name="submitit" class=button onclick="expresso_offline_access.do_login(document.getElementById('users_combo').value,MD5(document.getElementById('passwd').value))">
+						</td>
+						</tr>
+					  <tr>	
+				  		<td width="66">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+				  			</td>
+						<td width="135">&nbsp;</td>
+						<td>&nbsp;</td>	
+				  			
+				  	   </tr>		
+					</table>              
+              </td>
+              </form>
+          </tr>
+        </tbody></table>      
+      </td</tr></table>
+      </div>
+      </td>		
+    <td valign="bottom" bgcolor="#e8eef7"><div align="left"><img src="../phpgwapi/templates/celepar/images/logo_expresso_1.gif" alt=""></div></td>
+	</tr>
+	<tr>		
+    <td background="../phpgwapi/templates/celepar/images/logo_expresso_4.gif"><div align="right"><img src="../phpgwapi/templates/celepar/images/logo_expresso_3.gif" alt="" height="46" width="485"></div></td>		
+    <td background="../phpgwapi/templates/celepar/images/logo_expresso_5.gif"><div align="left"><img src="../phpgwapi/templates/celepar/images/logo_expresso_2.gif" alt="" height="46" width="285"></div></td>
+	</tr>	
+	<tr>	
+<style type="text/css">
+<!--
+.style2 {font-size: 10px}
+-->
+</style>
+    <td bgcolor="#f7f7f7" valign="top"><div align="right">
+        <table border="0" cellpadding="0" cellspacing="0" width="300px">
+          <tbody><tr> 
+            <td><a title="Governo do Paran&aacute;" href="http://www.pr.gov.br" target="_blank"><img border=0 src="../phpgwapi/templates/celepar/images/logo_governo.gif"/></a></td>
+            <td><div align="center"><a title="Celepar Inform&aacute;tica do Paran&aacute;" target="_blank" href="http://www.celepar.pr.gov.br/"><img border=0 src="../phpgwapi/templates/celepar/images/logo_celepar.gif"></a><a title="eGroupWare" style="text-decoration:none" target="_blank" href="http://www.egroupware.org/"><font color="#9a9a9a" face="Verdana, Arial, Helvetica, sans-serif" size="1"><br>Powered by eGroupWare {version}</a></font></div></td>
+          </tr>
+        </tbody></table><br>
+      </div></td>
+	 <td bgcolor="#f7f7f7" height="100%"></td>
+	</tr>	
+</tbody></table>
+</td></tr></tbody></table>
+</td></tr></table>
+</body></html>
Index: /branches/2.0/expressoMail1_2/templates/classic/signature-example.tpl
===================================================================
--- /branches/2.0/expressoMail1_2/templates/classic/signature-example.tpl	(revision 1196)
+++ /branches/2.0/expressoMail1_2/templates/classic/signature-example.tpl	(revision 1196)
@@ -0,0 +1,8 @@
+<br>
+<br>
+<div width="100%" style="padding-left: 10px;"><font size="3">{full_name} . <em><strong>{first_name}</strong></em></font><br />
+Seu Cargo<br />
+Sua Empresa<br />
+Fone (XX) XXXX.XXXX - Fax (XX) XXXX.XXXX </div>
+<div style="border-left: 1px solid red; padding-left: 10px;" width="100%"><a href="http://www.expressolivre.org/">www.expressolivre.org</a>  </div>
+<div style="border-left: 1px solid red; border-bottom: 1px solid red; width: 10%;">&nbsp;</div>
Index: /branches/2.0/expressoMail1_2/templates/classic/main.css
===================================================================
--- /branches/2.0/expressoMail1_2/templates/classic/main.css	(revision 1196)
+++ /branches/2.0/expressoMail1_2/templates/classic/main.css	(revision 1196)
@@ -0,0 +1,491 @@
+* {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+}
+
+.checkbox {
+	border:none !important;
+}
+
+textarea{
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 13px;
+}
+
+.table_box{
+	width: 100%;
+	color: black;
+	background: #ffffff;
+	border-style: solid;
+	border-width: 1px;
+	border-color: #bbbbbb;
+	font-family: Arial;
+	font-size: 13px;
+	cursor: pointer;
+}
+
+.em_div_write_msg{
+	height: 16px;
+	background: #f7f8fa;
+}
+
+
+/* begin class msgs */
+.tr_msg_unread {
+	color: black;
+	background-color: #e8eef7 !important;
+	font-weight: bold !important;
+	border-bottom:1px solid #cfcfcf;
+    -moz-user-select: none;
+}
+.tr_msg_read, .tr_msg_read2 {
+	color: black;
+	background-color: #ffffff;
+	border-bottom:1px solid #cfcfcf;
+    -moz-user-select: none;
+}
+
+.selected_msg{
+	background-color: #ffffcc !important;
+}
+.flagged_msg{
+	color: red;
+}
+.selected_shortcut_msg{
+	color: white;
+	background-color: #5194d2 !important;
+}
+.show_img_link{
+	width : 100%;
+	color: black;
+        font-weight: bold;
+	background-color: #ffc;
+	border-bottom:1px solid #cfcfcf;
+	cursor: pointer;		 
+	-moz-user-select: none;
+}
+/* end class msgs */
+
+.show_img_link:hover {
+	color: #000 !important;
+}
+
+.action_info_table {
+	border-spacing: 0px 0px;
+}
+.action_info_th {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	border-width: 0px 0px 0px 0px;
+	padding: 1px 10px 0px 10px;	
+	border-style: inset inset inset inset;
+	border-color: gray gray gray gray;
+	background-color: rgb(250, 209, 99);
+	-moz-border-radius: 6px 6px 6px 6px;
+}
+
+.message_header{
+	background-color: #CCCCCC;
+}
+
+.table_message_header_box{
+	width: 100%;
+	color: black;
+	border-style: solid;
+	border-width: 0px;
+	border-collapse: collapse;
+	border-color: #bbbbbb;
+	font-family: Arial;
+	font-size: 13px;	
+	cursor: pointer;
+}
+.font-menu
+{
+    text-decoration: none;
+    text-align: center;
+    font: bold 13px Lucidatypewriter,monospace;
+    color: #505050;
+}
+
+.font-menu-sel
+{
+    text-decoration: none;
+    text-align: center;
+    font: bold 13px Lucidatypewriter,monospace;
+   	color:#0000FF;
+}
+
+.menu-sel
+{
+    text-decoration: none;
+    text-align: center;
+    font: bold 13px Lucidatypewriter,monospace;
+   	color:#0000FF;
+    height: 20px;
+	width:220px;
+    background-color: #F7F7F7;
+    margin-bottom: 0px;
+    border-left: 1px solid #000000;
+    border-top: 1px solid #000000;
+    border-right: 1px solid #000000;
+    padding:0px 5px 0px 0px;
+    -moz-border-radius: 9px 9px 0px 0px;
+    -moz-user-select: none;
+    cursor: pointer;	
+}
+.menu
+{
+    text-decoration: none;
+    text-align: center;
+    font: bold 13px Lucidatypewriter,monospace;
+    color: #505050;
+    height: 20px;    
+	width:220px;
+    background-color:#E5E5E5;
+    margin-bottom: 0px;
+    border-left: 1px solid #c0c0c0;
+    border-top: 1px solid #c0c0c0;
+    border-right: 1px solid #c0c0c0;       
+    border-bottom: 1px solid #000000;
+	padding:0px 5px 0px 0px;
+    -moz-border-radius: 9px 9px 0px 0px;
+    -moz-user-select: none;
+    cursor: pointer;
+}
+
+.last_menu
+{
+	border-bottom: 1px solid #000000;
+	-moz-border-radius: 0px 0px 0px 0px;
+}
+
+.conteudo {
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    font-size: 10px;
+    font-weight: normal;
+    color: #000033;
+	padding: 1px;
+    border-color: gray gray gray gray;
+   
+	border-right: 1px solid #000000;
+	border-left: 1px solid #000000;
+	border-bottom: 1px solid #000000;
+	width:99.5%;
+    -moz-border-radius: 0px 0px 6px 6px;
+}
+
+.table_message{
+	background-color: #CCCCCC;
+	padding: 1px;
+	cursor: default;
+	border-width: 1px 1px 1px 1px;
+	border-spacing: 0px 1px;
+	border-style: outset outset outset outset;
+	border-color: gray gray gray gray;
+	border-collapse: separate;
+	-moz-border-radius: 3px 3px 3px 3px;
+}
+.table_top{
+	background-color: #FFFFFF;
+	padding:1px 1px 1px 1px;
+	height:16px;
+	cursor: default;
+	margin: 0px 0px 0px 0px;
+	border-width: 0px 1px 1px 1px;
+	border-style: outset outset outset outset;
+	border-color: black black black black;	
+}
+
+.tr_message_header{
+	background-color: #EEEEEE;
+	cursor: default;
+	border-style: none none none none;
+	-moz-border-radius: 0px 0px 0px 0px;
+}
+
+.tr_message_body{
+	background-color: #FFFFFF;
+	cursor: default;
+	-moz-border-radius: 9px 9px 9px 9px;
+}
+
+.message_body{
+	background-color: #FFFFFF;
+	cursor: default;
+	-moz-border-radius: 9px 9px 9px 9px;
+}
+
+.header_message_field{
+	font-weight: bold;
+}
+
+.suggestion_list
+{
+background: white;
+border: 1px solid;
+padding: 4px;
+}
+        
+.suggestion_list ul
+{
+padding: 0;
+margin: 0;
+list-style-type: none;
+}
+
+.suggestion_list a
+{
+text-decoration: none;
+color: navy;
+}
+
+.suggestion_list .selected
+{
+background: navy;
+color: white;
+}
+        
+        
+.suggestion_list .selected a
+{
+color: white;
+}
+
+#autosuggest
+{
+display: none;
+} 
+
+div#tipDiv {
+  position:absolute; visibility:hidden; left:0; top:0; z-index:10000;
+  background-color:#EFEFEF; border:1px solid #337;
+  width:220px; padding:0px;
+  color:#000; font-size:11px; line-height:1.2;
+  cursor: pointer;
+}
+
+.richtext_toolbar {background-color: #C0C0C0;}
+.imagebutton {border: solid 2px #C0C0C0; background-color: #C0C0C0; float:left;}
+.select_richtext {float:left;}
+/*.image {position: relative; left: 1; top: 1; height:20; width:21; border:none;}*/
+/*.imagebutton_out: {border-style: solid 2px #C0C0C0;}*/
+/*.imagebutton_over: {border-style: outset 20px;}*/
+.sel_color{	border-width:1px;border-color:#FFFFFF;border-style:solid;cursor:pointer;}
+.unsel_color{border-width:1px;border-color:#BBBBBB;border-style:solid;}
+
+/* Conf tree	*/
+.dtree {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 8px;
+	color: #000000;
+	/*white-space: nowrap;*/
+	background-color: #FFFFFF;
+
+}
+.dtree img {
+	border: 0px;
+	vertical-align: middle;
+
+}
+.dtree a {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	color: #000000;
+	white-space: nowrap;	
+}
+.dtree table{
+	margin-top: 0%;
+	padding: 0px 0px 0px 0px;
+}
+.dtree td{
+	padding: 0px 0px 0px 0px;
+}
+
+.folderscol{
+	/*width: 18%;*/
+	width: 100%;
+	/*float: left;*/
+	/*padding: 0px 0px 0px 0px;*/
+}
+
+.messagescol{
+	/*padding-left: 18.5%;*/
+	/*width: 85%;*/
+	width: 100%;
+	/*float: left*/
+	/*margin-rigth: 0px;*/
+	padding: 0px 0px 0px 0px;
+}
+
+.menu-folders
+{
+	text-align: center;
+    text-decoration: none;
+	font: bold 12px Verdana, Arial, Helvetica, sans-serif;
+	color: rgb(0, 102, 51);
+	width: 100%;
+	height: 20px;
+
+	border-right: 1px solid #000000;
+	border-left: 1px solid #000000;
+	border-top: 1px solid #000000;
+		
+	cursor: default;
+    -moz-border-radius: 9px 9px 0px 0px;
+}
+
+.content-menu {
+	padding: 3px 0px 3px 5px;
+	border-top: 1px solid #000000;
+    border-right: 1px solid #000000;
+    border-left: 1px solid #000000;
+	border-bottom: 1px solid #000000;
+	-moz-border-radius: 9px 9px 9px 9px;
+}
+.content-menu-td {
+	border: 1px solid #f7f7f7;
+}
+
+.content-folders {
+	padding: 0px 0px 0px 0px;
+	width:162px;
+	border-top: 1px solid #000000;
+    border-right: 1px solid #000000;
+    border-left: 1px solid #000000;
+	border-bottom: 1px solid #000000;
+    -moz-border-radius: 9px 9px 9px 9px;
+
+	position: relative;
+	overflow: auto;
+}
+
+/* Conf Filter	*/
+.filter {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 8px;
+	background-color : #FFFFFF;
+}
+.filter img {
+	border: 0px;
+	vertical-align: middle;
+}
+.filter a {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	color: #000000;
+	white-space: nowrap;
+}
+
+.message_options {
+	cursor: pointer;
+	color: blue;
+	white-space: nowrap;
+	/*padding:0 1.8;*/
+}
+.message_options_trash,
+.message_options_import,
+.message_options_export,
+.message_options_print,
+.message_options_move {
+        padding:0pt 1pt 1pt 8pt;
+}
+.message_options_inactive {
+         white-space: nowrap;
+        color: #999;
+}
+
+.message_options_active {
+	white-space: nowrap;	
+	color: blue;
+	cursor: pointer;
+}
+
+.message_options_over {
+	cursor: pointer;
+	color: blue;
+	white-space: nowrap;
+	font-weight: bold;
+	text-decoration: underline;
+}
+
+.em_sidebox_menu {
+	position: relative;
+	left: 2px;
+	padding: 0px 13px 0px 0px;
+	font-weight: bold;
+	font-size: 10px;
+	color: #666666;
+	text-decoration: none;
+	white-space: nowrap;
+	font-family: sans-serif;
+}
+
+.em_div_sidebox_menu {
+	position: relative;
+	left: 5px;
+	cursor: pointer;
+}
+.catalog{
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	font-weight: bold;
+}
+
+div.quicksearchcontacts {
+	border-width: 1px;
+	border-style: solid;
+	broder-color: grey;
+	overflow: auto;
+	position: relative;
+	left: 10px;
+	height: 302px;
+	width: 577px;
+}
+
+table.quicksearchcontacts {
+	border-width: 0px 0px 0px 0px;
+	border-spacing: 0px;
+	background-color: white;
+	cursor: default;
+}
+
+tr.quicksearchcontacts_unselected {
+	background-color: white;
+}
+
+tr.quicksearchcontacts_selected {
+	background-color: #5598d7;
+	color: white;
+}
+
+td.quicksearchcontacts_cc {
+	border-style: none;
+}
+
+input.em_button_like_span {
+	border:0px none !important;
+	margin: 0px !important;
+	padding:0px !important;
+	color:blue !important;
+	background:transparent none repeat scroll 0% !important;
+	font-family:Verdana,Arial,Helvetica,sans-serif !important;
+	font-size:11px !important;
+	height:15px !important;
+}
+
+
+
+.l {
+	background-image: url() !important;
+	padding: 0 13 0 0 !important;
+	font-weight: bold !important;
+	font-size: 10px !important;
+	color: #666 !important;
+	text-decoration: none !important;
+	font-family: sans-serif !important;
+}
+.sl {
+	background-image: url() !important; 
+	padding: 0 13 0 0 !important;
+	font-weight: bold !important;
+	font-size: 10px !important;
+	color: #0000FF !important;
+	font-family: sans-serif !important;
+}
Index: /branches/2.0/expressoMail1_2/templates/classic/error.html
===================================================================
--- /branches/2.0/expressoMail1_2/templates/classic/error.html	(revision 1196)
+++ /branches/2.0/expressoMail1_2/templates/classic/error.html	(revision 1196)
@@ -0,0 +1,11 @@
+<br><br><br>
+<table width='100%' height='100%'>
+	<tr><td width="100%" align='center' height="100%" valign="center">
+	<div style="background-color:white;height:150px;padding:20px;width:50%;border:1px dashed black"><br>
+	<img align="left" src="templates/default/images/manutencao.png" style="margin-right:15px;">
+	<br>
+	<p style="color:darkblue;text-align:justify;font-size:12px">Caro Usuário, <br><br>O <u>serviço de email</u> do Expresso encontra-se temporariamente indisponível. Por favor, retorne mais tarde.</p>
+	<div style="color:darkblue;font-size:12px" align="right"><b>Suporte Expresso Livre</b></div>
+	</td></tr>
+</table>
+<br><br><br>
