Index: trunk/phpgwapi/templates/classic/listUsers.php
===================================================================
--- trunk/phpgwapi/templates/classic/listUsers.php	(revision 1151)
+++ trunk/phpgwapi/templates/classic/listUsers.php	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/css.tpl
===================================================================
--- trunk/phpgwapi/templates/classic/css.tpl	(revision 1151)
+++ trunk/phpgwapi/templates/classic/css.tpl	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/about_unknown.tpl
===================================================================
--- trunk/phpgwapi/templates/classic/about_unknown.tpl	(revision 1151)
+++ trunk/phpgwapi/templates/classic/about_unknown.tpl	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/notes/notes98.reg
===================================================================
--- trunk/phpgwapi/templates/classic/notes/notes98.reg	(revision 1151)
+++ trunk/phpgwapi/templates/classic/notes/notes98.reg	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/notes/notes.html
===================================================================
--- trunk/phpgwapi/templates/classic/notes/notes.html	(revision 1151)
+++ trunk/phpgwapi/templates/classic/notes/notes.html	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/css/celepar.css
===================================================================
--- trunk/phpgwapi/templates/classic/css/celepar.css	(revision 1151)
+++ trunk/phpgwapi/templates/classic/css/celepar.css	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/css/kneschke.css
===================================================================
--- trunk/phpgwapi/templates/classic/css/kneschke.css	(revision 1151)
+++ trunk/phpgwapi/templates/classic/css/kneschke.css	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/css/jerryr.css
===================================================================
--- trunk/phpgwapi/templates/classic/css/jerryr.css	(revision 1151)
+++ trunk/phpgwapi/templates/classic/css/jerryr.css	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/css/idots.css
===================================================================
--- trunk/phpgwapi/templates/classic/css/idots.css	(revision 1151)
+++ trunk/phpgwapi/templates/classic/css/idots.css	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/frames_body.tpl
===================================================================
--- trunk/phpgwapi/templates/classic/frames_body.tpl	(revision 1151)
+++ trunk/phpgwapi/templates/classic/frames_body.tpl	(revision 1151)
@@ -0,0 +1,3 @@
+<!-- BEGIN frame_body -->
+  <frame src="{body_link}" name="phpgw_body">
+<!-- END frame_body -->
Index: trunk/phpgwapi/templates/classic/login_celepar.php
===================================================================
--- trunk/phpgwapi/templates/classic/login_celepar.php	(revision 1151)
+++ trunk/phpgwapi/templates/classic/login_celepar.php	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/history_list.tpl
===================================================================
--- trunk/phpgwapi/templates/classic/history_list.tpl	(revision 1151)
+++ trunk/phpgwapi/templates/classic/history_list.tpl	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/listUsers.tpl
===================================================================
--- trunk/phpgwapi/templates/classic/listUsers.tpl	(revision 1151)
+++ trunk/phpgwapi/templates/classic/listUsers.tpl	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/footer.tpl
===================================================================
--- trunk/phpgwapi/templates/classic/footer.tpl	(revision 1151)
+++ trunk/phpgwapi/templates/classic/footer.tpl	(revision 1151)
@@ -0,0 +1,8 @@
+		 							</td></tr></table>
+									</div>
+		  <!-- Applicationbox Column -->
+		  </td>
+		  </tr>
+  </table>
+</div>
+<!-- END footer.tpl -->
Index: trunk/phpgwapi/templates/classic/addressbook.tpl
===================================================================
--- trunk/phpgwapi/templates/classic/addressbook.tpl	(revision 1151)
+++ trunk/phpgwapi/templates/classic/addressbook.tpl	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/portal.tpl
===================================================================
--- trunk/phpgwapi/templates/classic/portal.tpl	(revision 1151)
+++ trunk/phpgwapi/templates/classic/portal.tpl	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/login.css
===================================================================
--- trunk/phpgwapi/templates/classic/login.css	(revision 1151)
+++ trunk/phpgwapi/templates/classic/login.css	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/classic/head.inc.php	(revision 1151)
+++ trunk/phpgwapi/templates/classic/head.inc.php	(revision 1151)
@@ -0,0 +1,1 @@
+link ../default/head.inc.php
Index: trunk/phpgwapi/templates/classic/head.tpl
===================================================================
--- trunk/phpgwapi/templates/classic/head.tpl	(revision 1151)
+++ trunk/phpgwapi/templates/classic/head.tpl	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/accounts_popup.tpl
===================================================================
--- trunk/phpgwapi/templates/classic/accounts_popup.tpl	(revision 1151)
+++ trunk/phpgwapi/templates/classic/accounts_popup.tpl	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/source/logo.svg
===================================================================
--- trunk/phpgwapi/templates/classic/source/logo.svg	(revision 1151)
+++ trunk/phpgwapi/templates/classic/source/logo.svg	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/config.tpl
===================================================================
--- trunk/phpgwapi/templates/classic/config.tpl	(revision 1151)
+++ trunk/phpgwapi/templates/classic/config.tpl	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/frames_navbar.tpl
===================================================================
--- trunk/phpgwapi/templates/classic/frames_navbar.tpl	(revision 1151)
+++ trunk/phpgwapi/templates/classic/frames_navbar.tpl	(revision 1151)
@@ -0,0 +1,3 @@
+<!-- BEGIN frame_navbar -->
+  <frame src="{navbar_link}" name="phpgw_navbar" scrolling="no">
+<!-- END frame_navbar -->
Index: trunk/phpgwapi/templates/classic/doc/TODO
===================================================================
--- trunk/phpgwapi/templates/classic/doc/TODO	(revision 1151)
+++ trunk/phpgwapi/templates/classic/doc/TODO	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/doc/CHANGELOG
===================================================================
--- trunk/phpgwapi/templates/classic/doc/CHANGELOG	(revision 1151)
+++ trunk/phpgwapi/templates/classic/doc/CHANGELOG	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/doc/README
===================================================================
--- trunk/phpgwapi/templates/classic/doc/README	(revision 1151)
+++ trunk/phpgwapi/templates/classic/doc/README	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/login.tpl
===================================================================
--- trunk/phpgwapi/templates/classic/login.tpl	(revision 1151)
+++ trunk/phpgwapi/templates/classic/login.tpl	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/navbar.inc.php
===================================================================
--- trunk/phpgwapi/templates/classic/navbar.inc.php	(revision 1151)
+++ trunk/phpgwapi/templates/classic/navbar.inc.php	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/navbar.tpl
===================================================================
--- trunk/phpgwapi/templates/classic/navbar.tpl	(revision 1151)
+++ trunk/phpgwapi/templates/classic/navbar.tpl	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/navbar_app.tpl
===================================================================
--- trunk/phpgwapi/templates/classic/navbar_app.tpl	(revision 1151)
+++ trunk/phpgwapi/templates/classic/navbar_app.tpl	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/about.tpl
===================================================================
--- trunk/phpgwapi/templates/classic/about.tpl	(revision 1151)
+++ trunk/phpgwapi/templates/classic/about.tpl	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/frames.tpl
===================================================================
--- trunk/phpgwapi/templates/classic/frames.tpl	(revision 1151)
+++ trunk/phpgwapi/templates/classic/frames.tpl	(revision 1151)
@@ -0,0 +1,7 @@
+<!-- BEGIN frames -->
+<html>
+ <frameset rows="{frame_size}" border="0">
+  {frames_}
+ </frameset>
+</html>
+<!-- END frames -->
Index: trunk/phpgwapi/templates/classic/js/cookieManager.js
===================================================================
--- trunk/phpgwapi/templates/classic/js/cookieManager.js	(revision 1151)
+++ trunk/phpgwapi/templates/classic/js/cookieManager.js	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/js/pngfix.js
===================================================================
--- trunk/phpgwapi/templates/classic/js/pngfix.js	(revision 1151)
+++ trunk/phpgwapi/templates/classic/js/pngfix.js	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/js/browserDetect.js
===================================================================
--- trunk/phpgwapi/templates/classic/js/browserDetect.js	(revision 1151)
+++ trunk/phpgwapi/templates/classic/js/browserDetect.js	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/js/listUsers.js
===================================================================
--- trunk/phpgwapi/templates/classic/js/listUsers.js	(revision 1151)
+++ trunk/phpgwapi/templates/classic/js/listUsers.js	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/js/simple_show_hide.js
===================================================================
--- trunk/phpgwapi/templates/classic/js/simple_show_hide.js	(revision 1151)
+++ trunk/phpgwapi/templates/classic/js/simple_show_hide.js	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/js/slidereffects.js
===================================================================
--- trunk/phpgwapi/templates/classic/js/slidereffects.js	(revision 1151)
+++ trunk/phpgwapi/templates/classic/js/slidereffects.js	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/nextmatchs.tpl
===================================================================
--- trunk/phpgwapi/templates/classic/nextmatchs.tpl	(revision 1151)
+++ trunk/phpgwapi/templates/classic/nextmatchs.tpl	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/hook_settings.inc.php
===================================================================
--- trunk/phpgwapi/templates/classic/hook_settings.inc.php	(revision 1151)
+++ trunk/phpgwapi/templates/classic/hook_settings.inc.php	(revision 1151)
@@ -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: trunk/phpgwapi/templates/classic/login_denylogin.tpl
===================================================================
--- trunk/phpgwapi/templates/classic/login_denylogin.tpl	(revision 1151)
+++ trunk/phpgwapi/templates/classic/login_denylogin.tpl	(revision 1151)
@@ -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: trunk/phpgwapi/templates/default/listUsers.php
===================================================================
--- trunk/phpgwapi/templates/default/listUsers.php	(revision 1151)
+++ trunk/phpgwapi/templates/default/listUsers.php	(revision 1151)
@@ -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: trunk/phpgwapi/templates/default/details.inc.php
===================================================================
--- trunk/phpgwapi/templates/default/details.inc.php	(revision 1151)
+++ trunk/phpgwapi/templates/default/details.inc.php	(revision 1151)
@@ -0,0 +1,3 @@
+<?php
+define( 'default_TEMPLATE_TITLE', 'default' );
+?>
Index: trunk/phpgwapi/templates/default/listUsers.tpl
===================================================================
--- trunk/phpgwapi/templates/default/listUsers.tpl	(revision 1151)
+++ trunk/phpgwapi/templates/default/listUsers.tpl	(revision 1151)
@@ -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: trunk/phpgwapi/templates/default/footer.tpl
===================================================================
--- trunk/phpgwapi/templates/default/footer.tpl	(revision 2)
+++ trunk/phpgwapi/templates/default/footer.tpl	(revision 1151)
@@ -1,14 +1,8 @@
-<!-- BEGIN footer -->
-</td></tr></table>
-<table border="0" cellspacing="0" cellpadding="0" width="100%" bgcolor="{table_bg_color}">
-  <tr>
-    <td>&nbsp;{user_info}<br></td>
-    <td align="center">{current_users}<br></td>
-    <td align="right">{powered_by}&nbsp;<br></td>
-  </tr>
-</table>
-</body>
-</html>
-
-<!-- END footer -->
-
+		 							</td></tr></table>
+									</div>
+		  <!-- Applicationbox Column -->
+		  </td>
+		  </tr>
+  </table>
+</div>
+<!-- END footer.tpl -->
Index: trunk/phpgwapi/templates/default/login.tpl
===================================================================
--- trunk/phpgwapi/templates/default/login.tpl	(revision 2)
+++ trunk/phpgwapi/templates/default/login.tpl	(revision 1151)
@@ -3,5 +3,4 @@
 <!-- BEGIN login_form -->
 <HEAD>
-
 <META http-equiv="Content-Type" content="text/html; charset={charset}">
 <META name="AUTHOR" content="dGroupWare http://www.eGroupWare.org">
@@ -9,59 +8,108 @@
 <META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW">
 <META NAME="keywords" CONTENT="{website_title} login screen, eGroupWare, groupware, groupware suite">
+<link href="phpgwapi/templates/default/login.css" rel="stylesheet" type="text/css">
+<TITLE>{website_title} - {lang_login}</TITLE>
+<script language="Javascript">
+<!--
 
-<TITLE>{website_title} - {lang_login}</TITLE>
+	function setLogin(){
+		if( document.flogin.organization != null)
+			document.flogin.login.value = document.flogin.organization.value+'-'+document.flogin.user.value;
+		else
+			document.flogin.login.value = document.flogin.user.value;			
+	}
+	
+	function getLogin(){
+		var cookie = '{cookie}';
+		if( document.flogin.organization != null)
+			document.flogin.user.value= cookie.substring(cookie.indexOf('-')+1,cookie.length);
+		else	
+			document.flogin.user.value= cookie;
+
+		if(document.flogin.user.value == '') {
+			if(document.flogin.organization != null)
+				document.flogin.organization.focus();
+			else
+				document.flogin.user.focus();
+		}
+		else
+			document.flogin.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">
+<div id="conteudo">
+<div style="position: absolute; top:0px; right: 10px;"><span class="login_label">{lang_language}&nbsp;&nbsp;</span>{select_language}</div>
+<div align="center">
+	<div id="conteudo_corpo">
+		<div id="superior">
+		<div id="login">
+      <div align="center">
+<form name="flogin" 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">
+<div id="caixa_login">
+          <div id="reflexo">
+           <div class="titulo_login">Expresso Livre</div>
+           <div id="mensagem" class="msgInicial" >{cd}<br>{lang_message}</div>
+	   {action}
+            <div id="conteudo_login" style="display:{show};">
+              <div class="login_label">
+                <label for="usuario">{lang_username}</label>
+                <br />
+                <input class="input" type="text" maxlength="50" size="20" name="user" id="user" value="">
+              </div>
 
-<body bgcolor="#{bg_color}">
-<a href="{logo_url}"><img src="{logo_file}" alt="{logo_title}" title="{logo_title}" border="0"></a>
-<p>&nbsp;</p>
-<center>{lang_message}</center>
-<p>&nbsp;</p>
-
-<TABLE bgcolor="#000000" border="0" cellpadding="0" cellspacing="0" width="40%" align="center">
- <TR>
-  <TD>
-   <TABLE border="0" width="100%" bgcolor="#486591" cellpadding="2" cellspacing="1">
-    <TR bgcolor="#{bg_color_title}">
-     <TD align="LEFT" valign="MIDDLE">
-      <font color="#FEFEFE">&nbsp;{website_title}</font>
-     </TD>
-    </TR>
-    <TR bgcolor="#e6e6e6">
-     <TD valign="BASELINE">
-
-		<FORM name="login" method="post" action="{login_url}" {autocomplete}>
-		<input type="hidden" name="passwd_type" value="text">
-		<input type="hidden" name="account type" value="u">
-			<TABLE border="0" align="CENTER" bgcolor="#486591" width="100%" cellpadding="0" cellspacing="0">
-				<TR bgcolor="#e6e6e6">
-					<TD colspan="3" align="CENTER">{cd}</TD>
-				</TR>
-				<TR bgcolor="#e6e6e6">
-					<TD align="RIGHT"><font color="#000000">{lang_username}:&nbsp;</font></TD>
-					<TD><input name="login" value="{cookie}"></TD>
-					<TD>{select_domain}</TD>
-				</TR>
-				<TR bgcolor="#e6e6e6">
-					<TD align="RIGHT"><font color="#000000">{lang_password}:&nbsp;</font></TD>
-					<TD><input name="passwd" type="password"></TD>
-					<TD>&nbsp;</TD>
-				</TR>
-				<TR bgcolor="#e6e6e6">
-					<TD colspan="3" align="CENTER"><input type="submit" value="{lang_login}" name="submitit"></TD>
-				</TR>
-				<TR bgcolor="#e6e6e6">
-					<TD colspan="3" align="right"><font color="#000000" size="-1">eGroupWare {version}</font></TD>
-				</TR>       
-			</TABLE>
-		</FORM>
-     
-     </TD>
-    </TR>
-   </TABLE>
-  </TD>
- </TR>
-</TABLE>
-
-<!-- END login_form -->
-</HTML>
+              <div class="login_label">
+                <label for="senha">{lang_password}</label>
+                <br />
+                <input class="input" type="password" maxlength="50" size="20" name="passwd" id="passwd" value="">
+              </div>
+		{captcha}
+      
+              <input value="{lang_login}" name="submitit" class="button" onclick="javascript:setLogin()" type="submit" style="margin-top:10px"/>
+            </div> 
+<div style="margin-top:5px">
+ {link_alterna_login}
+</div>
+          </div>
+          <div id="rodape_login">
+	    <div class="ajuda"><a target="help" href="./phpgwapi/templates/{template}/help.php?lang={lang}">Ajuda</a></div>
+          </div>
+        </div>
+</form>
+</div>
+</div>
+</div>
+<div id="inferior"><br />
+<div id="rodape">
+<table align="center" cellspacing="0" cellpadding="0" border="0">
+	<tr>
+		<td>
+			<table border="0" cellpadding="0" cellspacing="0" width="300px">
+          		<tbody>
+          			<tr> 
+            			<td>{logo_config}
+				<br><a title="Projeto Expresso Livre" target="_blank" href="http://www.expressolivre.org/">Expresso Livre</a> {version}
+				<br><a title="eGroupWare" target="_blank" href="http://www.egroupware.org/"> Powered by eGroupWare </a></div></td>
+          			</tr>
+        		</tbody>
+        	</table>
+        </td>
+	</tr>
+</table>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div>{applet}</div>
+</body></html>
Index: trunk/phpgwapi/templates/default/navbar_app.tpl
===================================================================
--- trunk/phpgwapi/templates/default/navbar_app.tpl	(revision 2)
+++ trunk/phpgwapi/templates/default/navbar_app.tpl	(revision 1151)
@@ -1,1 +1,3 @@
-<td align="{align}" valign="top" width="{width}">{value}</td>
+<!--	<TD width="10%" align=center><img src="{img_root}/admin.jpg" width="60" height="62"></TD>-->
+
+<!--<td align="center" width="{width}">{value}</td>-->
Index: trunk/phpgwapi/templates/default/navbar.tpl
===================================================================
--- trunk/phpgwapi/templates/default/navbar.tpl	(revision 2)
+++ trunk/phpgwapi/templates/default/navbar.tpl	(revision 1151)
@@ -1,39 +1,190 @@
-<!-- BEGIN navbar -->
+<!-- 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();		
+	}
+var zoominTimer = new Array();
+var zoomoutTimer = new Array();
+function zoom_in(id)
+{
+	clearTimeout(zoomoutTimer[id]);
+	var elem = document.getElementById(id);
+	if (elem.height > 34)
+	{
+		clearTimeout(zoominTimer[id]);
+		return false;
+	}	
+	elem.height += 4;
+	elem.width += 4;
+	zoominTimer[id] = setTimeout('zoom_in("'+id+'");',30);
+}
+function zoom_out(id)
+{
+	clearTimeout(zoominTimer[id]);		
+	var elem = document.getElementById(id);
+	if (elem.height < 24)
+	{
+		clearTimeout(zoomoutTimer[id]);
+		return false;
+	}	
+	elem.height -= 2;
+	elem.width -= 2;
+	zoomoutTimer[id] = setTimeout('zoom_out("'+id+'");',30);
+}
+</script>
+
+<div class="toolbar" id="toolbar" style="visibility:hidden">
+<table border="0" height="50px" width="100%" cellpadding=0 cellspacing=0><tr>
+	<td class="logo_expresso">&nbsp;<br></td>
+	<td align="center">
+	<table width="auto" border="0" cellpadding="0" cellspacing="0">{app_icons}</table>
+	</td><td style="padding-left:0px;padding-right:25px" align="right" nowrap>
+</td></tr></table>
+<div id ="divStatusBar">
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr bgcolor="{navbar_color}">
-  <td align="left">&nbsp;</td>
- </tr>
  <tr>
-  <td>
-   <table width="100%" border="0" cellspacing="0" cellpadding="3" bgcolor="white">
-    <tr >
-	   {applications}  
-    </tr>
-   </table>
+  <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/{template}/images/preferences.png"><font id="links_bar">{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/{template}/images/critic.png"><font id="links_bar">{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/{template}/images/help.png"><font id="links_bar">{help}</font></a>
   </td>
- </tr>  
- <tr bgcolor="{navbar_color}">
-  <td align="left">&nbsp;</td>
  </tr>
 </table>
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
-  <td align="left">
-   {powered_by}
-  </td>
- </tr>
-<!-- <tr>
-  <td align="left" colspan="2">
-   {user_info}
-  </td>
-  <td align="right">
-   {current_users}
-  </td>
- </tr>-->
-</table>
-<table width="100%" cellspacing="5"><tr><td>
-<!-- BEGIN app_header -->
-<b>{current_app_header}</b><hr>
-<!-- END app_header -->
-{messages}<br>
-<!-- END navbar -->
+</div>
+</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" class="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: trunk/phpgwapi/templates/default/js/cookieManager.js
===================================================================
--- trunk/phpgwapi/templates/default/js/cookieManager.js	(revision 1151)
+++ trunk/phpgwapi/templates/default/js/cookieManager.js	(revision 1151)
@@ -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: trunk/phpgwapi/templates/default/js/pngfix.js
===================================================================
--- trunk/phpgwapi/templates/default/js/pngfix.js	(revision 1151)
+++ trunk/phpgwapi/templates/default/js/pngfix.js	(revision 1151)
@@ -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: trunk/phpgwapi/templates/default/js/browserDetect.js
===================================================================
--- trunk/phpgwapi/templates/default/js/browserDetect.js	(revision 1151)
+++ trunk/phpgwapi/templates/default/js/browserDetect.js	(revision 1151)
@@ -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: trunk/phpgwapi/templates/default/js/listUsers.js
===================================================================
--- trunk/phpgwapi/templates/default/js/listUsers.js	(revision 1151)
+++ trunk/phpgwapi/templates/default/js/listUsers.js	(revision 1151)
@@ -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: trunk/phpgwapi/templates/default/js/simple_show_hide.js
===================================================================
--- trunk/phpgwapi/templates/default/js/simple_show_hide.js	(revision 1151)
+++ trunk/phpgwapi/templates/default/js/simple_show_hide.js	(revision 1151)
@@ -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: trunk/phpgwapi/templates/default/js/slidereffects.js
===================================================================
--- trunk/phpgwapi/templates/default/js/slidereffects.js	(revision 1151)
+++ trunk/phpgwapi/templates/default/js/slidereffects.js	(revision 1151)
@@ -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: trunk/phpgwapi/templates/default/login_denylogin.tpl
===================================================================
--- trunk/phpgwapi/templates/default/login_denylogin.tpl	(revision 2)
+++ trunk/phpgwapi/templates/default/login_denylogin.tpl	(revision 1151)
@@ -1,14 +1,14 @@
 
 <!-- BEGIN form -->
-<BODY bgcolor="#FFFFFF">
-<A href="http://www.eGroupWare.org"><img src="phpgwapi/templates/{template_set}/images/logo.gif" title="www.eGroupWare.org" border="0"></a>
+<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" height="94%" width="100%">
- <TR>
-  <TD align="CENTER">
-    Opps! You caught us in the middle of a system upgrade.<br>Please, check back with us shortly.
-  </TD>
- </TR>
-</TABLE>
+<table border="0" width="100%">
+ <tr>
+  <td align="center">
+    {deny_msg}
+  </td>
+ </tr>
+</table>
 
 <!-- END form -->
Index: trunk/phpgwapi/templates/default/help.php
===================================================================
--- trunk/phpgwapi/templates/default/help.php	(revision 1151)
+++ trunk/phpgwapi/templates/default/help.php	(revision 1151)
@@ -0,0 +1,24 @@
+<?php
+
+$GLOBALS['phpgw_info']['flags'] = array(
+	'disable_Template_class' => True,
+	'login'                  => True,
+	'currentapp'             => 'login',
+	'noheader'               => True
+);
+	require_once('../../../header.inc.php');
+	$GLOBALS['phpgw_info']['server']['template_dir'] = PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['login_template_set'];
+	$tmpl = CreateObject('phpgwapi.Template', $GLOBALS['phpgw_info']['server']['template_dir']);
+	$tmpl->set_file(array('login_form' => 'help.tpl'));
+	$tmpl->set_var('website_title', $GLOBALS['phpgw_info']['server']['site_title']);
+        $tmpl->set_var('template_set',$GLOBALS['phpgw_info']['login_template_set']);
+	$GLOBALS['phpgw']->translation->init();
+	$GLOBALS['phpgw']->translation->add_app('loginhelp');
+	$GLOBALS['phpgw']->translation->add_app('loginhelp',$_GET['lang']);
+	if(lang('loginhelp_message') != 'loginhelp_message*')
+	{
+		$tmpl->set_var('login_help',lang('loginhelp_message'));
+	}
+	$tmpl->pfp('loginout','login_form');
+?>
+
Index: trunk/phpgwapi/templates/default/help.tpl
===================================================================
--- trunk/phpgwapi/templates/default/help.tpl	(revision 1151)
+++ trunk/phpgwapi/templates/default/help.tpl	(revision 1151)
@@ -0,0 +1,17 @@
+<!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="./login.css" rel="stylesheet" type="text/css">
+<TITLE>{website_title} - {lang_login}</TITLE>
+<BODY>
+<div id="conteudo">
+{login_help}
+</div>
+</BODY>
+</HTML>
Index: trunk/phpgwapi/templates/default/css.tpl
===================================================================
--- trunk/phpgwapi/templates/default/css.tpl	(revision 2)
+++ trunk/phpgwapi/templates/default/css.tpl	(revision 1151)
@@ -1,13 +1,7 @@
 <style type="text/css">
 <!--
-	a { text-decoration:none; color: {link}; }
-	a:active{ text-decoration:none; color: {alink}; }
-	a:hover{ text-decoration:underline; color: {alink}; }
-	a:visted{ text-decoration:none; color: {link}; }
-	body { margin-top: 0px; margin-right: 0px; margin-left: 0px; font-family: {font}; }
 	.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}; }
-	.tablink { color: #000000; }
 	{app_css}
 -->
Index: trunk/phpgwapi/templates/default/css/azul.css
===================================================================
--- trunk/phpgwapi/templates/default/css/azul.css	(revision 1151)
+++ trunk/phpgwapi/templates/default/css/azul.css	(revision 1151)
@@ -0,0 +1,420 @@
+ul
+{
+	list-style-image: url("../images/orange-ball.png");
+}
+
+.prefTable
+{	  
+    background-color:#f4f8fb !important;    
+    margin: 0px 0px 10px 0px ;
+    border-left: 1px solid #D3DCE3;
+    border-right: 1px solid #D3DCE3;    
+    border-bottom: 1px solid #D3DCE3;
+    
+}
+
+.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;	
+}
+
+a:link,a:visited
+{
+	cursor:pointer !important;
+	color: #000066 !important;
+	text-decoration: none !important;
+}
+
+a:hover,a:active
+{
+	cursor:pointer !important;
+	color: #ff9933 !important;
+	text-decoration: underline !important;
+}
+
+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;	
+}
+
+
+
+.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:#416faa;
+	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
+{
+	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;
+}
+
+#user_info
+{
+	color: white;
+}
+#links_bar
+{
+	        color: white;
+}
+
+#divStatusBar
+{
+	height:24px;
+	padding-left:10px;
+	padding-top:0px;
+}
+
+#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: url(../images/bgAppTitle.png);
+	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: #fff url(../images/bgBlockContent.jpg);
+	background-repeat:repeat-x;
+	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; 
+}
+
+
+.fmButton
+{
+	background-image:url(../images/buttonbackground.png);
+	width:28px;
+	height:28px;
+	background-repeat: no-repeat;
+}
+
+#fmLocation
+{
+	position:relative;
+	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;
+}
+
+.navbar_but
+{
+	background-image: url(../../../../phpgwapi/templates/default/images/back_app.png) !important;
+	width: 40px;
+	height: 40px;
+	vertical-align: center;
+	text-align: center;
+	padding-right: 6px;
+	cursor:pointer;
+	cursor:hand;
+	background-repeat:no-repeat;
+}
+
+.navbar_butOver
+{
+	background-image: url(../../../../phpgwapi/templates/default/images/back_app_over.png) !important;
+	width: 40px;
+	height: 40px;
+	vertical-align: center !important;
+	text-align: center !important;
+	padding-right:6px;
+	cursor:pointer;
+	cursor:hand;
+	background-repeat:no-repeat;
+}
+
+.navbar_butOut
+{
+	background-image: url(../../../../phpgwapi/templates/default/images/back_app.png) !important;
+	width: 40px;
+	height: 40px;
+	vertical-align: center !important;
+	text-align: center !important;
+	padding-right:6px;
+	cursor:pointer;
+	cursor:hand;
+	background-repeat:no-repeat;
+}
+.toolbar
+{
+       background-image:url(../../../../phpgwapi/templates/default/images/fundo_topo.png);
+       position:absolute;
+}
+
+.logo_expresso
+{
+	background:url(../../../../phpgwapi/templates/default/images/logo_expresso.png) no-repeat 0 3px;
+	width: 191px;
+}
Index: trunk/phpgwapi/templates/default/css/celepar.css
===================================================================
--- trunk/phpgwapi/templates/default/css/celepar.css	(revision 1151)
+++ trunk/phpgwapi/templates/default/css/celepar.css	(revision 1151)
@@ -0,0 +1,472 @@
+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;
+}
+
+#user_info
+{
+	color: white;
+}
+#links_bar
+{
+	        color: white;
+}
+
+#divStatusBar
+{
+	height:24px;
+	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-color: #ebf0f7;
+	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: #ebf0f7;
+	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;
+}
+
+.navbar_but
+{
+	background-image: url(../../../../phpgwapi/templates/default/images/back_app.png) !important;
+	width: 40px;
+	height: 40px;
+	vertical-align: center;
+	text-align: center;
+	padding-right: 6px;
+	cursor:pointer;
+	cursor:hand;
+	background-repeat:no-repeat;
+}
+
+.navbar_butOver
+{
+	background-image: url(../../../../phpgwapi/templates/default/images/back_app_over.png) !important;
+	width: 40px;
+	height: 40px;
+	vertical-align: center !important;
+	text-align: center !important;
+	padding-right:6px;
+	cursor:pointer;
+	cursor:hand;
+	background-repeat:no-repeat;
+}
+
+.navbar_butOut
+{
+	background-image: url(../../../../phpgwapi/templates/default/images/back_app.png) !important;
+	width: 40px;
+	height: 40px;
+	vertical-align: center !important;
+	text-align: center !important;
+	padding-right:6px;
+	cursor:pointer;
+	cursor:hand;
+	background-repeat:no-repeat;
+
+}
+.toolbar
+{
+        background-image:url(../../../../phpgwapi/templates/default/images/fundo_topo.png);
+        position:absolute;
+}
+
+.logo_expresso
+{
+	position: absolute;
+	background:url(../../../../phpgwapi/templates/default/images/logo_expresso.png) no-repeat;
+	width: 191px;
+	left: 0px;
+	top: 3px;
+}
Index: trunk/phpgwapi/templates/default/css/comics.css
===================================================================
--- trunk/phpgwapi/templates/default/css/comics.css	(revision 1151)
+++ trunk/phpgwapi/templates/default/css/comics.css	(revision 1151)
@@ -0,0 +1,550 @@
+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
+{
+	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
+}
+
+#calendarid, #expressoMail12id, #contactcenterid, #newsadminid, #logout_id, #homeid, #adminid, #expressoadmin12id, #jabberitmessengerid, #expressoCalendarid
+{
+	padding-top: 4px !important;
+	padding-left: 5px !important;
+	height: 24px !important;
+	width: 24px !important;
+}
+
+#divAppTextBar
+{
+	background-color:white;
+}
+
+#user_info
+{
+	color: black;
+}
+#links_bar
+{
+	color: black;
+}
+
+#divStatusBar
+{
+	height:24px;
+	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-color: white;
+	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-image: url(../../../../phpgwapi/templates/default/images/comics_bg.jpg);
+	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;
+}
+
+.navbar_but
+{
+	background-image: url(../../../../phpgwapi/templates/default/images/back_app_comics.png) !important; 
+	width: 40px;
+	height: 45px;
+	vertical-align: top;
+	text-align: center;
+	padding-right: 12px;
+	cursor:pointer;
+	cursor:hand;
+	background-repeat:no-repeat;
+}
+
+.navbar_butOver
+{
+	background-image: url(../../../../phpgwapi/templates/default/images/back_app_over_comics.png) !important;
+	width: 40px;
+	height: 45px;
+	vertical-align: top !important;
+	text-align: center !important;
+	padding-right:12px;
+	cursor:pointer;
+	cursor:hand;
+	background-repeat:no-repeat;
+}
+
+.navbar_butOut
+{
+	background-image: url(../../../../phpgwapi/templates/default/images/back_app_out_comics.png) !important;
+	width: 40px;
+	height: 45px;
+	vertical-align: top !important;
+	text-align: center !important;
+	padding-right:6px;
+	cursor:pointer;
+	cursor:hand;
+	background-repeat:no-repeat;
+}
+
+.toolbar
+{
+	background-color: white;
+	position:absolute;
+}
+
+.logo_expresso
+{
+	background:url(../../../../phpgwapi/templates/default/images/logo_expresso_comics.png) no-repeat;
+	width: 264px;
+	height: 35px;
+}
+
+.content-menu {
+	padding: 0px 0px 0px 0px !important;
+	background: #fff !important;
+}
+.content-folders {
+	padding: 0px 0px 0px 0px !important;
+	background: #fff url(../../../../phpgwapi/templates/default/images/folder_bg_comics.jpg) no-repeat scroll center bottom !important;
+}
+
+.message_header
+{
+	background-color: #606060 !important;
+	color: white !important;
+}
+
+.menu
+{
+	background-color: #DDD !important;
+	border: 2px solid black !important;
+	-moz-border-radius-topleft:20px !important;
+	-moz-border-radius-topright:20px !important;
+	border-bottom: 0px !important;
+}
+
+
+.menu-sel
+{
+	-moz-border-radius-topleft:5px !important;
+        -moz-border-radius-topright:5px !important;
+        background-color: white !important;
+        border: 2px solid black !important;
+        border-bottom: 0px !important;
+	color black !important;
+}
+
+.last_menu {
+	border-bottom:2px solid black !important;
+}
+
+.conteudo {
+	-moz-border-radius-bottomleft:16px !important;
+	-moz-border-radius-bottomright:16px !important;
+	-moz-border-radius-topleft:0 !important;
+	-moz-border-radius-topright:16px !important;
+	border-left:2px solid black !important;
+	border-bottom:2px solid black !important;
+	border-right:2px solid black !important;
+	border-top: 0px !important;
+	padding: 0px !important;
+}
+
+.message_options_active {
+	color: #D00 !important;
+	font-weight: bold !important;
+}
+
+.message_options_inactive {
+	color: #999 !important;
+}
+
+.message_options {
+	color: white !important;
+	font-weight: bold !important;
+}
+
+.message_options_over {
+	color: #D00 !important;
+	font-weight: bold !important
+}
+#table_message,
+.table_message,
+.tr_message_header
+{
+	background: #666 !important;
+	background-color: #666 !important;
+	color: white !important;
+}
Index: trunk/phpgwapi/templates/default/css/rochas.css
===================================================================
--- trunk/phpgwapi/templates/default/css/rochas.css	(revision 1151)
+++ trunk/phpgwapi/templates/default/css/rochas.css	(revision 1151)
@@ -0,0 +1,535 @@
+ul
+{
+	list-style-image: url("../images/orange-ball.png");
+}
+
+.grid_email_class
+{
+	border-bottom:1px solid #cfcfcf;
+}
+.selected_shortcut_msg {
+	color:	black	!important;
+	background-color: BurlyWood !important;
+}
+
+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;
+}
+
+#user_info
+{
+	color: black;
+}
+#links_bar
+{
+	        color: black;
+}
+
+#divStatusBar
+{
+	height:24px;
+	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-color: #eeeee0;
+	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: #eeeee0;
+	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;
+}
+.navbar_but
+{
+        background-image: url(../../../../phpgwapi/templates/default/images/back_app_canyon.png) !important;
+        width: 40px;
+        height: 40px;
+        vertical-align: center;
+        text-align: center;
+        padding-right: 6px;
+        cursor:pointer;
+        cursor:hand;
+        background-repeat:no-repeat;
+}
+
+.navbar_butOver
+{
+        background-image: url(../../../../phpgwapi/templates/default/images/back_app_over_canyon.png) !important;
+        width: 40px;
+        height: 40px;
+        vertical-align: center !important;
+        text-align: center !important;
+        padding-right:6px;
+        cursor:pointer;
+        cursor:hand;
+        background-repeat:no-repeat;
+}
+
+.navbar_butOut
+{
+        background-image: url(../../../../phpgwapi/templates/default/images/back_app_out_canyon.png) !important;
+        width: 40px;
+        height: 40px;
+        vertical-align: center !important;
+        text-align: center !important;
+        padding-right:6px;
+        cursor:pointer;
+        cursor:hand;
+        background-repeat:no-repeat;
+}
+
+.toolbar
+{
+        background-image:url(../../../../phpgwapi/templates/default/images/fundo_topo_canyon.png);
+        position:absolute;
+}
+
+.logo_expresso
+{
+        background:url(../../../../phpgwapi/templates/default/images/logo_expresso_canyon.png) no-repeat;
+        width: 264px;
+        height: 35px;
+}
+
+.content-menu {
+        padding: 0px 0px 0px 0px !important;
+        background: #fff !important;
+}
+
+.content-folders {
+        padding: 0px 0px 0px 0px !important;
+        background: #ddf4fe url(../../../../phpgwapi/templates/default/images/folder_bg_canyon.jpg) no-repeat scroll center bottom !important;
+}
+.navbar_butOut
+{
+        background-image: url(../../../../phpgwapi/templates/default/images/back_app_out_canyon.png) !important;
+        width: 40px;
+        height: 40px;
+        vertical-align: center !important;
+        text-align: center !important;
+        padding-right:6px;
+        cursor:pointer;
+        cursor:hand;
+        background-repeat:no-repeat;
+}
+
+.toolbar
+{
+        background-image:url(../../../../phpgwapi/templates/default/images/fundo_topo_canyon.png);
+        position:absolute;
+}
+
+.logo_expresso
+{
+        background:url(../../../../phpgwapi/templates/default/images/logo_expresso_canyon.png) no-repeat;
+        width: 264px;
+        height: 35px;
+}
+
+.message_header{
+        background-color: #cfb69e !important;
+}
+.menu
+{
+	background-color:#a19183 !important;
+	border: 1px solid #f4f7fc !important;
+	border-bottom: 1px solid #4a79b1 !important;
+}
+.menu-sel{
+    color:#0000FF !important;
+    background-color:#F7F7F7 !important;
+    border-color: #A19183 !important;
+}
+.table_message{
+        background: url(../../../../phpgwapi/templates/default/images/fundo_topo_canyon.png) !important;
+}
+
+.message_options {
+	 color: #863 !important;
+}
+
+.tr_msg_unread
+{
+	background-color:#EEEEE0 !important;
+}
Index: trunk/phpgwapi/templates/default/css/escritorio.css
===================================================================
--- trunk/phpgwapi/templates/default/css/escritorio.css	(revision 1151)
+++ trunk/phpgwapi/templates/default/css/escritorio.css	(revision 1151)
@@ -0,0 +1,513 @@
+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: RoyalBlue !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
+{
+	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
+}
+
+#divAppBox
+{
+        padding: 0 0 0 0 !important;
+}
+
+#divAppTextBar
+{
+	background-color:white;
+}
+
+#user_info
+{
+	color: white;
+}
+#links_bar
+{
+	        color: white;
+}
+
+#divStatusBar
+{
+	height:24px;
+	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:0px;
+	margin-left:0px;
+	margin-right:0px;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	font-weight: bold;
+	color: white !important;
+	text-align: center;
+	padding: 0px;
+	background-color: #101A33;
+	height:24px;
+	line-height:24px;
+	border-top-width:0px !important;
+}
+
+#divAppbox
+{
+	background-color: white;
+	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;
+}
+
+
+.navbar_butOver
+{
+	background-image: none !important;
+	vertical-align: center !important;
+	text-align: center !important;
+	padding-right:15px;
+	padding-left:10px;
+	cursor:pointer;
+	cursor:hand;
+	background-repeat:no-repeat;
+}
+
+.navbar_butOut
+{
+	background-image: none !important;
+	vertical-align: center !important;
+	text-align: center !important;
+	cursor:pointer;
+	cursor:hand;
+	background-repeat:no-repeat;
+}
+
+.toolbar
+{
+	background-image:url(../../../../phpgwapi/templates/default/images/fundo_topo_office.jpg);
+	position:absolute;
+}
+
+.logo_expresso
+{
+	background:url(../../../../phpgwapi/templates/default/images/logo_expresso_office.jpg) no-repeat;
+	width: 500px;
+	height: 35px;
+}
+
+.boxHeaderText{
+        color: white !important;
+}
+
+.content-menu {
+	padding: 0px 0px 0px 0px !important;
+	background: url(../../../../phpgwapi/templates/default/images/blackwhite.jpg) repeat-x !important;
+}
+.content-folders {
+	padding: 0px 0px 0px 0px !important;
+	background: #a0b2cc url(../../../../phpgwapi/templates/default/images/folder_bg_office.jpg) no-repeat scroll center bottom !important;
+}
+
+.message_header
+{
+	background-color: grey !important;
+}
+
+.menu
+{
+	background-color: lightgrey !important;
+	border: 1px solid #f4f7fc !important;
+	border-bottom: 1px solid #4a79b1 !important;
+}
+.message_options_active {
+	color: #D00 !important;
+	font-weight: bold !important;
+}
+
+.message_options_inactive {
+	color: #999 !important;
+}
+
+.message_options {
+	color: blue !important;
+	font-weight: bold !important;
+}
+
+.message_options_over {
+	color: #D00 !important;
+	font-weight: bold !important
+}
+
+.table_message{
+	background:#999 !important;
+}
+
+.last_menu{
+	border-bottom: 0px !important;
+	background: url(../../../../phpgwapi/templates/default/images/blackwhite.jpg);
+}
+
+.menu_sel{
+	-moz-border-radius-topleft:15px !important;
+	-moz-border-radius-topright:15px !important;	
+	background-color: #637164 !important;
+}
+
+#border_table{
+	background:transparent url(../../../../phpgwapi/templates/default/images/blackwhite.jpg);
+	padding:0 5 0 10 ;
+}
+
+.whiteSpace{
+	width: 10px !important;
+	background:transparent url(../../../../phpgwapi/templates/default/images/blackwhite.jpg) repeat-x;
+}
Index: trunk/phpgwapi/templates/default/css/cataratas.css
===================================================================
--- trunk/phpgwapi/templates/default/css/cataratas.css	(revision 1151)
+++ trunk/phpgwapi/templates/default/css/cataratas.css	(revision 1151)
@@ -0,0 +1,507 @@
+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
+{
+	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;
+}
+
+#user_info
+{
+	color: white;
+}
+#links_bar
+{
+	        color: white;
+}
+
+#divStatusBar
+{
+	height:24px;
+	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-color: #e6f3d9;
+	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: #e6f3d9;
+	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;
+}
+
+.navbar_but
+{
+	background-image: url(../../../../phpgwapi/templates/default/images/back_app_fozi.png) !important; 
+	width: 40px;
+	height: 40px;
+	vertical-align: center;
+	text-align: center;
+	padding-right: 6px;
+	cursor:pointer;
+	cursor:hand;
+	background-repeat:no-repeat;
+}
+
+.navbar_butOver
+{
+	background-image: url(../../../../phpgwapi/templates/default/images/back_app_over_fozi.png) !important;
+	width: 40px;
+	height: 40px;
+	vertical-align: center !important;
+	text-align: center !important;
+	padding-right:6px;
+	cursor:pointer;
+	cursor:hand;
+	background-repeat:no-repeat;
+}
+
+.navbar_butOut
+{
+	background-image: url(../../../../phpgwapi/templates/default/images/back_app_out_fozi.png) !important;
+	width: 40px;
+	height: 40px;
+	vertical-align: center !important;
+	text-align: center !important;
+	padding-right:6px;
+	cursor:pointer;
+	cursor:hand;
+	background-repeat:no-repeat;
+}
+
+.toolbar
+{
+	background-image:url(../../../../phpgwapi/templates/default/images/fundo_topo_fozi.jpg);
+	position:absolute;
+}
+
+.logo_expresso
+{
+	background:url(../../../../phpgwapi/templates/default/images/logo_expresso_fozi.gif) no-repeat;
+	width: 264px;
+	height: 35px;
+}
+
+.content-menu {
+	padding: 0px 0px 0px 0px !important;
+	background: #fff !important;
+}
+.content-folders {
+	padding: 0px 0px 0px 0px !important;
+	background: #a0b2cc url(../../../../phpgwapi/templates/default/images/folder_bg_fozi.jpg) no-repeat scroll center bottom !important;
+}
+
+.message_header
+{
+	background-color: #98c17f !important;
+}
+
+.menu
+{
+	background-color:#c2d8b1 !important;
+	border: 1px solid #f4f7fc !important;
+	border-bottom: 1px solid #4a79b1 !important;
+}
+.message_options_active {
+	color: #D00 !important;
+	font-weight: bold !important;
+}
+
+.message_options_inactive {
+	color: #999 !important;
+}
+
+.message_options {
+	color: blue !important;
+	font-weight: bold !important;
+}
+
+.message_options_over {
+	color: #D00 !important;
+	font-weight: bold !important
+}
+
+.table_message{
+	background:#98C17F !important;
+}
Index: trunk/phpgwapi/templates/default/css/metropole.css
===================================================================
--- trunk/phpgwapi/templates/default/css/metropole.css	(revision 1151)
+++ trunk/phpgwapi/templates/default/css/metropole.css	(revision 1151)
@@ -0,0 +1,563 @@
+ul
+{
+	list-style-image: url("../images/orange-ball.png");
+}
+
+.grid_email_class
+{
+	border-bottom:1px solid #cfcfcf;
+}
+
+body 
+{
+	margin: 0px !important;
+	background-color:#707070 !important;
+/*	color: white !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;
+}
+
+/*.tr_msg_read {
+background-color: #B0B0B0 !important;
+color:black !important;
+}
+
+.tr_msg_read2 {
+background-color: #808080 !important;
+color: #E0E0E0 !important;
+}*/
+
+
+
+.tr_msg_read {
+background-color: white !important;
+}
+
+.tr_msg_read2 {
+background-color: #E0E0E0 !important;
+}
+
+.table_box {
+border:0 solid white !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
+{
+	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;
+}
+
+#user_info
+{
+	color: white;
+}
+#links_bar
+{
+	        color: white;
+}
+
+#divStatusBar
+{
+	height:24px;
+	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:0px;
+	margin-left:0px;
+	margin-right:0px;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	font-weight: bold;
+	text-align: center;
+	padding: 0px;
+	height:24px;
+	line-height:24px;
+	border-top-color:#9c9c9c;
+	border-top-width:0px;
+	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;
+	background-color:  #404040  !important;
+        color: white !important;
+}
+
+.boxHeaderText{
+	color: white !important;
+}
+
+#divAppbox
+{
+	background-color: #707070 !important;
+	color: white !important;
+	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;
+}
+
+.navbar_but
+{
+	background-image: none !important; 
+	width: 37px;
+	height: 37px;
+	vertical-align: center;
+	text-align: center;
+	padding-top:5px;
+	padding-right: 0px;
+	cursor:pointer;
+	cursor:hand;
+	background-repeat:no-repeat;
+}
+
+.navbar_butOver
+{
+	background-image: none !important;
+	width: 37px;
+	height: 37px;
+	vertical-align: center !important;
+	text-align: center !important;
+	padding-top:5px;
+	padding-right:0px;
+	cursor:pointer;
+	cursor:hand;
+	background-repeat:no-repeat;
+}
+
+.navbar_butOut
+{
+	background-image: none !important;
+	width: 37px;
+	height: 37px;
+	vertical-align: center !important;
+	text-align: center !important;
+	padding-right:0px;
+	cursor:pointer;
+	cursor:hand;
+	background-repeat:no-repeat;
+}
+
+.toolbar
+{
+	background-image:url(../../../../phpgwapi/templates/default/images/fundo_topo_metropole.jpg);
+	position:absolute;
+}
+
+.logo_expresso
+{
+	background:url(../../../../phpgwapi/templates/default/images/logo_expresso_metropole.png) no-repeat;
+	width: 264px;
+	height: 35px;
+}
+.folders_degrade
+{
+	background-image: url(../../../../phpgwapi/templates/default/images/degrade_black.png) !important;
+	background-repeat: repeat-x !important;
+}
+
+.content-menu {
+	padding: 0px 0px 0px 0px !important;
+	background: #000 !important;
+}
+.content-folders {
+	padding: 0px 0px 0px 0px !important;
+	background: #000 url(../../../../phpgwapi/templates/default/images/folder_bg_metropole.png) no-repeat scroll center bottom !important;
+}
+
+.message_header
+{
+	background-color: #404040 !important;
+	color: white !important;
+}
+.tr_message_header{
+	background-color: black !important;
+}
+
+.selected_shortcut_msg {
+        background-color:  #404040  !important;
+	color: #E0E0E0 !important;
+}
+
+#tdAppbox {
+background-color: black !important;
+}
+
+.menu
+{
+	background-color:#ccc !important;
+	border: 1px solid #f4f7fc !important;
+	border-bottom: 1px solid #4a79b1 !important;
+}
+.message_options_active {
+	color: #D00 !important;
+	font-weight: bold !important;
+}
+
+.message_options_inactive {
+	color: #999 !important;
+}
+
+.message_options {
+	color: white !important;
+	font-weight: bold !important;
+}
+
+.message_options_over {
+	color: #D00 !important;
+	font-weight: bold !important
+}
+
+.table_message{
+	background:#333 !important;
+	color: white !important;
+	border: 0px !important;
+}
+.last_menu{
+	border-bottom: 1px solid gray !important;
+}
Index: trunk/phpgwapi/templates/default/notes/notes98.reg
===================================================================
--- trunk/phpgwapi/templates/default/notes/notes98.reg	(revision 1151)
+++ trunk/phpgwapi/templates/default/notes/notes98.reg	(revision 1151)
@@ -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: trunk/phpgwapi/templates/default/notes/notes.html
===================================================================
--- trunk/phpgwapi/templates/default/notes/notes.html	(revision 1151)
+++ trunk/phpgwapi/templates/default/notes/notes.html	(revision 1151)
@@ -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: trunk/phpgwapi/templates/default/head.tpl
===================================================================
--- trunk/phpgwapi/templates/default/head.tpl	(revision 2)
+++ trunk/phpgwapi/templates/default/head.tpl	(revision 1151)
@@ -1,16 +1,26 @@
-<!-- BEGIN head --><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset={charset}">
-<META name="AUTHOR" content="eGroupWare http://www.egroupware.org">
-<META NAME="description" CONTENT="eGroupWare">
-<META NAME="keywords" CONTENT="eGroupWare">
-<meta name="robots" content="none">
-<LINK REL="ICON" href="{img_icon}" type="image/x-ico">
-<LINK REL="SHORTCUT ICON" href="{img_shortcut}">
-{css}
-<TITLE>{website_title}</TITLE>
-{java_script}
-</HEAD>
-<BODY {body_tags}>
+<!-- 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: trunk/phpgwapi/templates/default/login.css
===================================================================
--- trunk/phpgwapi/templates/default/login.css	(revision 1151)
+++ trunk/phpgwapi/templates/default/login.css	(revision 1151)
@@ -0,0 +1,156 @@
+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;
+}
+
+a:link,a:visited
+{
+	cursor:pointer;
+	color: #006699; 
+	text-decoration: none;
+}
+
+a:hover,a:active
+{
+	cursor:pointer;
+	color: #ff9933;
+	text-decoration: underline;
+}
+#conteudo {
+        background:url(../../../phpgwapi/templates/default/images/back_pagina.jpg) repeat-x #fff;
+}
+
+#conteudo_corpo{
+        margin:auto 0; width:770px;
+}
+
+#superior {
+        background: url(../../../phpgwapi/templates/default/images/fundo1.jpg) no-repeat top left;
+        height:340px;
+}
+
+#login {
+        text-align:left;
+        position: relative;
+        top: 80px;
+        right:162px;
+}
+
+#login td {
+        text-align:left;
+}
+
+.login_label {
+        font-family:  Arial, Verdana,Helvetica, sans-serif;
+        font-size: 12px;
+        color: #003366;
+        font-weight: bold;
+}
+
+
+.button {
+        background:url(../../../phpgwapi/templates/default/images/back_botao.jpg) #1F4F7E no-repeat scroll left top;
+        color:#fff;
+        font-family: Arial,Verdana, Helvetica, sans-serif;
+        font-size:12px;
+        padding-top:2px 4px 2px 4px;
+        margin:2px 1px 0pt;
+        border: medium none;
+        font-weight: bold;
+        height:31px;
+        width:83px;
+}
+
+#caixa_login {
+	width: 262px; 
+	margin-right:10px;			
+	background: url("../../../phpgwapi/templates/default/images/corpo.jpg") repeat-y; 
+}
+
+#reflexo {
+	background:url(../../../phpgwapi/templates/default/images/topo_reflexo.jpg) no-repeat center top;
+}
+
+.button:hover {
+        background:url(../../../phpgwapi/templates/default/images/back_botao_over.jpg) #FD9C0E no-repeat top left;
+        color:#1F4F7E;
+}
+
+#inferior {
+        background: url(../../../phpgwapi/templates/default/images/fundo2.jpg) no-repeat top left;
+        height:146px;
+}
+
+#rodape {
+        text-align:left;
+        width:100%;
+        position: relative;
+        margin:0;
+}
+
+#rodape_login {
+	background: #FFF url("../../../phpgwapi/templates/default/images/rodape.jpg") no-repeat; 
+	height: 41px;
+	clear: both; 
+}
+
+#rodape table {
+        width:250px;
+        font-family:  Arial, Verdana,Helvetica, sans-serif;
+        font-size:11px;
+        color: #666666;
+        text-align:right;
+        margin-left:108px;
+        _margin-left:58px;
+}
+
+.ajuda {
+	text-align:left;
+	padding-top: 15px;
+	margin-left:50px;
+}
+.ajuda a {
+        font-family:  Arial, Verdana,Helvetica, sans-serif;
+        font-size:11px;
+        color: #FFF;
+        font-weight:bold;
+        text-decoration:none;
+}
+
+.ajuda a:hover {
+        text-decoration:underline;
+}
+
+.login_Label {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	color: #000066;
+	padding-top: 0px;
+}
+
+.msgInicial {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	height: 15px;
+	font-size: 12px;
+	color: #000066;
+	font-weight: bold;
+	padding-bottom: 13px;
+	padding-left: 0px;
+}
+
+.titulo_login {
+	font-family:  Arial, Verdana,Helvetica, sans-serif;
+	font-size: 14px;
+	color: #85A9CF;
+	font-weight: bold;
+	width:220px;
+	text-transform:uppercase;
+	line-height:22px;
+	padding:2px;
+}
Index: trunk/phpgwapi/templates/default/portal.tpl
===================================================================
--- trunk/phpgwapi/templates/default/portal.tpl	(revision 2)
+++ trunk/phpgwapi/templates/default/portal.tpl	(revision 1151)
@@ -1,11 +1,11 @@
 <!-- BEGIN portal_box -->
-<p>
-<table border="{outer_border}" cellpadding="0" cellspacing="0" width="{outer_width}" bordercolor="{outer_bordercolor}" bgcolor="{outer_bgcolor}">
+<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 align="center" background="{header_background_image}">{title}</td>{portal_controls}
+  <td style="height:19px;border-top:0px;border-bottom:1px solid #d6e2ee;padding:1px;vertical-align:top;background-repeat:repeat-x;background: #fff url(phpgwapi/templates/default/images/bgBlockTitle.png)" align="left" nowrap>&nbsp;<font size="2" color="#003366">{title}</font></td>
  </tr>
  <tr>
-  <td colspan="2">
-   <table border="1" cellpadding="0" cellspacing="0" width="{inner_width}" bgcolor="{inner_bgcolor}">
+  <td style='background: #f4f8fb;border-top:0px solid #adc9d8'>
+   <table border="0" cellpadding="0" height="100%" cellspacing="0" width="{inner_width}">
     {row}
    </table>
@@ -13,16 +13,17 @@
  </tr>
 </table>
-</p>
+</div>
 <!-- END portal_box -->
 <!-- BEGIN portal_row -->
     <tr>
-	  <td>
-{output}
+	  <td >
+		{output}
 	  </td>
     </tr>
 <!-- END portal_row -->
 <!-- BEGIN portal_listbox_header -->
-     <td>
-      <ul>
+	<tr>
+	 <td>
+	  <ul>
 <!-- END portal_listbox_header -->
 <!-- BEGIN portal_listbox_link -->
@@ -30,10 +31,10 @@
 <!-- END portal_listbox_link -->
 <!-- BEGIN portal_listbox_footer -->
-      </ul>
-     </td>
+	  </ul>
+	 </td>
+	</tr>
 <!-- END portal_listbox_footer -->
 <!-- BEGIN portal_control -->
-  <td valign="middle" align="right" nowrap background="{header_background_image}">{control_link}
-  </td>
+  <td valign="middle" align="right" nowrap="nowrap">{control_link}</td>
 <!-- END portal_control -->
 <!-- BEGIN link_field -->
Index: trunk/phpgwapi/templates/default/source/logo.svg
===================================================================
--- trunk/phpgwapi/templates/default/source/logo.svg	(revision 1151)
+++ trunk/phpgwapi/templates/default/source/logo.svg	(revision 1151)
@@ -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: trunk/phpgwapi/templates/default/accounts_popup.tpl
===================================================================
--- trunk/phpgwapi/templates/default/accounts_popup.tpl	(revision 1151)
+++ trunk/phpgwapi/templates/default/accounts_popup.tpl	(revision 1151)
@@ -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: trunk/phpgwapi/templates/default/login_default.php
===================================================================
--- trunk/phpgwapi/templates/default/login_default.php	(revision 1042)
+++ trunk/phpgwapi/templates/default/login_default.php	(revision 1151)
@@ -36,5 +36,7 @@
 			case 99:
 				return '<font color="FF0000">' . lang('Blocked, too many attempts') . '</font>';
-				
+			case 200:
+				return '<font color="FF0000">' . lang('Invalid code') . '</font>';
+			break;				
 			case 10:
 				$GLOBALS['phpgw']->session->phpgw_setcookie('sessionid');
@@ -105,4 +107,21 @@
 	if(isset($passwd_type) || $_POST['submitit_x'] || $_POST['submitit_y'] || $submit)
 	{
+
+	// Primeiro testa o captcha....se houver......
+	if( $GLOBALS['phpgw_info']['server']['captcha']==1)
+		{
+		if(isset($_POST['codigo']))
+			{
+			if ($_SESSION['CAPTCHAString'] != strtoupper($_POST['codigo']))
+				{
+					$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/login.php','cd=200'));
+				}
+			unset($_SESSION['CAPTCHAString']);
+			}
+		}
+	if($_POST['user'])
+		{
+			$_POST['login'] = $_POST['user'];
+		}
 ///// 	Início - Código temporário: Para renomeação de login com organização para sem. //////
 /*		$common = CreateObject('phpgwapi.common');
@@ -375,4 +394,122 @@
 	$tmpl->set_var('autocomplete', ($GLOBALS['phpgw_info']['server']['autocomplete_login'] ? 'autocomplete="off"' : ''));
 
+$aux_captcha = '';
+// soh mostra o captcha se for login sem certificado....
+if($GLOBALS['phpgw_info']['server']['captcha'] && $_GET['cd']!='300' )
+	{
+		if($valor_cookie > $GLOBALS['phpgw_info']['server']['num_badlogin'])
+			{
+				$aux_captcha = '<div class="login_label" >
+               <img src="./seguranca/captcha.php" title="'.lang('Security code').'" alt="'.lang('Security code').'" style="width:60;">
+<br />
+                <input class="input" type="text" maxlength="50" size="20" name="codigo" id="codigo" value="" >
+              </div>';
+				$tmpl->set_var('captcha',$aux_captcha);
+			}
+	}
+
+// Testa se deve incluir applet para login com certificado......
+if ($_GET['cd']=='300' && $GLOBALS['phpgw_info']['server']['certificado']==1)
+	{
+		//Zera o Cookie contador, responsavel pelo captcha
+		$valor_cookie = 1;
+		setcookie("contador", 1,0);
+
+		$link_alterna_login = '<img border=0 style="padding: 0px 5px 0px 0px" src="phpgwapi/templates/default/images/warning.gif"/><a href="login.php" style="margin: 0px; padding: 0px; text-decoration:none;"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="1">' . lang('Access without Digital Certificate') . '</a>';
+		$tmpl->set_var('show','none');
+		$tmpl->set_var('action','<div id="action"><img style="border:0px;margin:31px 0px 58px 0px;" src="phpgwapi/templates/default/images/acao.gif" /></div>');
+		// gera parametro com tokens suportados ....
+		$var_tokens = '';
+		for($ii = 1; $ii < 11; $ii++)
+			{
+				if($GLOBALS['phpgw_info']['server']['test_token' . $ii . '1'])
+					$var_tokens .= $GLOBALS['phpgw_info']['server']['test_token' . $ii . '1'] . ',';
+			}
+
+		if(!$var_tokens)
+			{
+				$var_tokens = 'ePass2000Lx;/usr/lib/libepsng_p11.so,ePass2000Win;c:/windows/system32/ngp11v211.dll';
+			}
+			$param1 = "
+                                                '<param name=\"token\" value=\"" . substr($var_tokens,0,strlen($var_tokens)) . "\"> ' + 
+                                               "; 
+			$param2 = "
+                                                'token=\"" . substr($var_tokens,0,strlen($var_tokens)) . "\" ' + 
+                                               "; 
+				
+			$cod_applet =
+
+/*    // com debug ativado
+            '<script type="text/javascript">
+					if (navigator.userAgent.match(\'MSIE\')){
+						document.write(\'<object style="display:yes;width:0;height:0;vertical-align:bottom;" id="login_applet" \' +
+						\'classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"> \' +
+						\'<param name="type" value="application/x-java-applet;version=1.5"> \' +
+						\'<param name="code" value="LoginApplet.class"> \' +
+						\'<param name="locale" value="' . $lang . '"> \' +
+						\'<param name="mayscript" value="true"> \' + '
+						. $param1
+						. ' \'<param name="archive" value="ExpressoCertLogin.jar,ExpressoCert.jar,commons-httpclient-3.1.jar,commons-logging-1.1.1.jar,commons-codec-1.3.jar,bcmail-jdk15-142.jar,mail.jar,activation.jar,bcprov-jdk15-142.jar"> \' +
+                        \'<param name="debug" value="true"> \' +
+						\'</object>\');
+					}
+					else {
+						document.write(\'<embed style="display:yes;width:0;height:0;vertical-align:bottom;" id="login_applet" code="LoginApplet.class" locale="' . $lang . '"\' +
+						\'archive="ExpressoCertLogin.jar,ExpressoCert.jar,commons-httpclient-3.1.jar,commons-logging-1.1.1.jar,commons-codec-1.3.jar,bcmail-jdk15-142.jar,mail.jar,activation.jar,bcprov-jdk15-142.jar" \' + '
+						. $param2
+						. ' \'type="application/x-java-applet;version=1.5" debug= "true" mayscript > \' +
+						\'<noembed> \' +
+						\'No Java Support. \' +
+						\'</noembed> \' +
+						\'</embed> \');
+					}
+				</script>';
+*/
+            // sem debug ativado
+            '<script type="text/javascript">
+					if (navigator.userAgent.match(\'MSIE\')){
+						document.write(\'<object style="display:yes;width:0;height:0;vertical-align:bottom;" id="login_applet" \' +
+						\'classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"> \' +
+						\'<param name="type" value="application/x-java-applet;version=1.5"> \' + 
+						\'<param name="code" value="LoginApplet.class"> \' +
+						\'<param name="locale" value="' . $lang . '"> \' +
+						\'<param name="mayscript" value="true"> \' + ' 
+						. $param1 
+						. ' \'<param name="archive" value="ExpressoCertLogin.jar,ExpressoCert.jar,commons-httpclient-3.1.jar,commons-logging-1.1.1.jar,commons-codec-1.3.jar,bcmail-jdk15-142.jar,mail.jar,activation.jar,bcprov-jdk15-142.jar"> \' +
+						\'</object>\');
+					}
+					else {
+						document.write(\'<embed style="display:yes;width:0;height:0;vertical-align:bottom;" id="login_applet" code="LoginApplet.class" locale="' . $lang . '"\' +
+						\'archive="ExpressoCertLogin.jar,ExpressoCert.jar,commons-httpclient-3.1.jar,commons-logging-1.1.1.jar,commons-codec-1.3.jar,bcmail-jdk15-142.jar,mail.jar,activation.jar,bcprov-jdk15-142.jar" \' + '
+						. $param2  
+						. ' \'type="application/x-java-applet;version=1.5" mayscript > \' +
+						\'<noembed> \' +
+						\'No Java Support. \' +
+						\'</noembed> \' +
+						\'</embed> \');
+					}
+				</script>';
+
+
+	}
+
+else
+	{
+		if($GLOBALS['phpgw_info']['server']['certificado']==1)
+			{
+				$tmpl->set_var('show','yes');
+				$link_alterna_login = '<img border=0 style="padding: 0px" src="phpgwapi/templates/default/images/lock1_icon.gif"/><a title="' . lang('Link to use digital certificate') . '" href="login.php?cd=300" style="margin: 0px; padding: 0px; text-decoration:none;"><font color="#ffffff" face="Verdana, Arial, Helvetica, sans-serif" size="1"><b>' . lang('Logon with my digital certificate') . '</b></font></a>';
+			}
+			$tmpl->set_var('lang_username',lang('username'));
+			$tmpl->set_var('action','');
+			$cod_applet = '';
+
+		}
+
+		$tmpl->set_var('applet',$cod_applet);
+		$tmpl->set_var('link_alterna_login',$link_alterna_login);
+		
+
 	$tmpl->pfp('loginout','login_form');
 ?>
+
Index: trunk/phpgwapi/templates/default/navbar.inc.php
===================================================================
--- trunk/phpgwapi/templates/default/navbar.inc.php	(revision 2)
+++ trunk/phpgwapi/templates/default/navbar.inc.php	(revision 1151)
@@ -1,172 +1,464 @@
 <?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.                                              *
-  \**************************************************************************/
+	/**************************************************************************\
+	* 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)
 	{
-		$tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
-		$tpl->set_unknowns('remove');
-
-		$tpl->set_file(
+		$GLOBALS['celepar_tpl'] = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
+
+		$GLOBALS['celepar_tpl']->set_file(
 			array(
-				'navbar'     => 'navbar.tpl',
-				'navbar_app' => 'navbar_app.tpl'
+				'navbar' => 'navbar.tpl'
 			)
 		);
 
-		$var['navbar_color'] = $GLOBALS['phpgw_info']['theme']['navbar_bg'];
-
-		if ($GLOBALS['phpgw_info']['flags']['navbar_target'])
-		{
-			$target = ' target="' . $GLOBALS['phpgw_info']['flags']['navbar_target'] . '"';
-		}
-
-		$i = 1;
+		$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"));
+		$GLOBALS['celepar_tpl']->set_var('template',$GLOBALS['phpgw_info']['server']['template_set']);
+
+		$var['img_root'] = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/'.$GLOBALS['phpgw_info']['server']['template_set'].'/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 ($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'] == 'text')
-			{
-				$tabs[$i]['label'] = $app_data['title'];
-				$tabs[$i]['link']  = $app_data['url'];
-				if (!empty($app_data['target']))
+			$current_app = False;
+				if($app != 'preferences' && $app != 'about' && $app != 'logout')
 				{
-					$tabs[$i]['target'] = $app_data['target'];
-				}
-				elseif (!empty($target))
+					$icon = '<a href="'.$app_data['url'].'">';
+					$title = $GLOBALS['phpgw_info']['apps'][$app]['title'];
+					if ($GLOBALS['phpgw_info']['flags']['currentapp'] == $app)
+					{
+						$icon .= '<img id="'.str_replace('_','',$app).'id" src="' . $app_data['icon'] . '" alt="' . $title . '" title="'. $title . '" border="0" width="35" height="35" nowrap="nowrap"/></a>';
+						$current_app = True;
+					}
+					else
+						$icon .= '<img id="'.str_replace('_','',$app).'id" src="' . $app_data['icon'] . '" alt="' . $title . '" title="'. $title . '" border="0" width="24" height="24" nowrap="nowrap"/></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 '.
+						'onmouseover="javascript:this.className=\'navbar_butOver\'; zoom_in(this.firstChild.firstChild.id)" '.
+						'onmouseout="javascript:this.className=\'navbar_but\'; '.($current_app?'':'zoom_out(this.firstChild.firstChild.id)').'" '.
+						'class="'.($current_app?'navbar_butOut':'navbar_but').'">';
+
+						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 id="logout_id" width="24" height="24" 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 nowrap '.
+				'onmouseover="javascript:this.className=\'navbar_butOver\'; zoom_in(this.firstChild.firstChild.id)" '.
+				'onmouseout="javascript:this.className=\'navbar_but\'; zoom_out(this.firstChild.firstChild.id)" '.
+				'class="navbar_but"><a onclick="location.href=\''.$GLOBALS['phpgw_info']['navbar']['logout']['url'].'\'">'.$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 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'])
 				{
-					$tabs[$i]['target'] = $target;
-				}
-				if (ereg($GLOBALS['phpgw_info']['navbar'][$app],$_SERVER['PHP_SELF']))
+					$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)
 				{
-					$selected = $i;
-				}
-				$i++;
+					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
 			{
-				$title = '<img src="' . $app_data['icon'] . '" alt="' . $app_data['title'] . '" title="'
-					. $app_data['title'] . '" border="0">';
-				if ($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'] == 'icons_and_text')
+				$var['icon_or_star']='<img src="'.$GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/'.$GLOBALS['phpgw_info']['server']['template_set'].'/images'.'/orange-ball.png" width="9" height="9" alt="ball"/>';
+				$var['target'] = '';
+				if(is_array($item_link))
 				{
-					$title .= "<br>" . $app_data['title'];
-					$var['width'] = '7%';
+					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['width']  = '3%';
-				}
-
-				$var['value'] = '<a href="' . $app_data['url'] . '"' . ($app_data['target'] ? $app_data['target'] : $target) . '>' . $title . '</a>';
-				$var['align'] = 'center';
-				$tpl->set_var($var);
-				$tpl->parse('applications','navbar_app',True);
-			}
-		}
-		if ($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'] == 'text')
-		{
-			$var['navbar_color'] = $GLOBALS['phpgw_info']['theme']['bg_color'];
-			$var['align'] = 'right';
-			$var['value'] = $GLOBALS['phpgw']->common->create_tabs($tabs,$selected,-1);
-			$tpl->set_var($var);
-			$tpl->parse('applications','navbar_app',True);
-		}
-
-		if ($GLOBALS['phpgw_info']['server']['showpoweredbyon'] == 'top')
-		{
-			$var['powered_by'] = lang('Powered by phpGroupWare version %1',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
-		}
-		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')
-				. '">&nbsp;' . lang('Current users') . ': ' . $GLOBALS['phpgw']->session->total() . '</a>';
-		}
-		$now = time();
-		$var['user_info'] = $GLOBALS['phpgw']->common->display_fullname() . ' - '
-				. lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
-				. $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
-//				. lang($GLOBALS['phpgw']->common->show_date($now,'F')) . ' '
-//				. $GLOBALS['phpgw']->common->show_date($now,'d, Y');
-
-		// Maybe we should create a common function in the phpgw_accounts_shared.inc.php file
-		// to get rid of duplicate code.
-		if ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == 0)
-		{
-			$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);
-		}
-
-		if (isset($GLOBALS['phpgw_info']['flags']['app_header']))
-		{
-			$var['current_app_header'] = $GLOBALS['phpgw_info']['flags']['app_header'];
-			$var['th_bg'] = $GLOBALS['phpgw_info']['theme']['th_bg'];
-		}
-		else
-		{
-			$tpl->set_block('navbar','app_header','app_header');
-			$var['app_header'] = '';
-		}
-
-		$tpl->set_var($var);
-		$tpl->pfp('out','navbar');
-		// 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 parse_navbar_end()
-	{
-		if ($GLOBALS['phpgw_info']['server']['showpoweredbyon'] == 'bottom')
-		{
-			$tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
-			$tpl->set_unknowns('remove');
-   
-			$tpl->set_file(
+					$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/'.$GLOBALS['phpgw_info']['server']['template_set'].'/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']);
-			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')
-					. '">&nbsp;' . lang('Current users') . ': ' . $GLOBALS['phpgw']->session->total() . '</a>';
-			}
-			$now = time();
-			$var['user_info'] = $GLOBALS['phpgw']->common->display_fullname() . ' - '
-				. lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
-				. $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
-			$tpl->set_var($var);
-			$GLOBALS['phpgw']->hooks->process('navbar_end');
-			$tpl->pfp('out','footer');
-		}
-	}
+			$GLOBALS['celepar_tpl']->set_var($var);
+			$GLOBALS['celepar_tpl']->pfp('out','footer');
+		}
Index: trunk/phpgwapi/templates/default/about.tpl
===================================================================
--- trunk/phpgwapi/templates/default/about.tpl	(revision 2)
+++ trunk/phpgwapi/templates/default/about.tpl	(revision 1151)
@@ -1,6 +1,6 @@
-<table border="0" width="100%">
+<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="logo"></a>
+   <a href="http://www.eGroupWare.org" target="_new"><img src="{phpgw_logo}" border="0" alt="eGroupWare"></a>
   </td>
  </tr>
@@ -9,14 +9,21 @@
  </tr>
  <tr>
-  <td align="center">{phpgw_version}</td>
+  <td align="left">{phpgw_version}</td>
  </tr>
  <tr>
-  <td align="center">{phpgw_message}</td>
+  <td align="left">{phpgw_message}</td>
  </tr>
  <tr>
-  <td><hr></td>
- </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 align="center">
+ <td  height="3"><img src="phpgwapi/templates/default/images/spacer.gif" alt="spacer" height="3" /></td>
+</tr>
+ <tr>
+  <td align="left">
 
 {phpgw_app_about}
Index: trunk/phpgwapi/templates/default/hook_settings.inc.php
===================================================================
--- trunk/phpgwapi/templates/default/hook_settings.inc.php	(revision 1151)
+++ trunk/phpgwapi/templates/default/hook_settings.inc.php	(revision 1151)
@@ -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: trunk/phpgwapi/templates/default/uiaccountsel.tpl
===================================================================
--- trunk/phpgwapi/templates/default/uiaccountsel.tpl	(revision 2)
+++ 	(revision )
@@ -1,206 +1,0 @@
-
-<script LANGUAGE="JavaScript">
-	window.focus();
-
-	function addOption(id,label,value)
-	{
-		opener.addOption(id,label,value);
-
-		selectBox = document.getElementById('uiaccountsel_popup_selection');
-		if (selectBox) {
-			for (i=0; i < selectBox.length; i++) {
-				if (selectBox.options[i].value == value) {
-					selectBox.options[i].selected = true;
-					break;
-				}
-			}
-			if (i >= selectBox.length) {
-				selectBox.options[selectBox.length] = new Option(label,value,false,true);
-			}
-		}
-	}
-
-	function removeSelectedOptions(id)
-	{
-		openerSelectBox = opener.document.getElementById(id);
-		if (openerSelectBox == null) window.close();
-		selectBox = document.getElementById('uiaccountsel_popup_selection');
-		for (i=0; i < selectBox.length; i++) {
-			if (selectBox.options[i].selected) {
-				for (j=0; j < openerSelectBox.length; j++) {
-					if (openerSelectBox[j].value == selectBox.options[i].value) {
-						openerSelectBox.removeChild(openerSelectBox[j]);
-					}
-				}
-				selectBox.options[i--] = null;
-			}
-		}
-	}
-
-	function copyOptions(id)
-	{
-		openerSelectBox = opener.document.getElementById(id);
-		selectBox = document.getElementById('uiaccountsel_popup_selection');
-		for (i=0; i < openerSelectBox.length; i++) {
-			with (openerSelectBox.options[i]) {
-				if (selected) {
-					selectBox.options[selectBox.length] =  new Option(text,value);
-				}
-			}
-		}
-	}
-</script>
-
-<style type="text/css">
-	.letter_box,.letter_box_active {
-		background-color: #E8F0F0;
-		width: 15px;
-		border: 1px solid white;
-		text-align: center;
-		cursor: pointer;
-		cusror: hand;
-	}
-	.letter_box_active {
-		font-weight: bold;
-		background-color: #D3DCE3;
-	}
-	.letter_box_active,.letter_box:hover {
-		border: 1px solid black;
-		background-color: #D3DCE3;
-	}
-</style>
-
-<div id="divMain">
-<table border="0" width="100%">
-	<tr>
-		<td width="20%" rowspan="3">{accountsel_icon}</td>
-		<td align="right" colspan="5">
-			<form method="POST" action="{search_action}">
-				{query_type}
-				<input type="text" name="query" value="{prev_query}">
-				<input type="submit" name="search" value="{lang_search}">
-			</form>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="5">
-			<table width="100%"><tr>
-<!-- BEGIN letter_search -->
-				<td class="{class}" onclick="location.href='{link}';">{letter}</td>
-<!-- END letter_search -->
-			</tr></table>
-		</td>
-	</tr>
-	<tr>
-		{left}
-		<td align="center">{lang_showing}</td>
-		{right}
-	</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 class="th" colspan="2" align="center"><b>{lang_groups}</b></td>
-				</tr>
-<!-- BEGIN bla_intro -->
-				<tr>
-					<td class="th" colspan="2">{lang_perm}</td>
-				</tr>
-
-<!-- END bla_intro -->
-
-<!-- BEGIN other_intro -->
-				<tr>
-					<td class="th" colspan="2">{lang_perm}</td>
-				</tr>
-<!-- END other_intro -->
-
-<!-- BEGIN group_cal -->
-				<tr class="{tr_color}">
-					<td><a href="{link_user_group}" title="{lang_list_members}">{name_user_group}</a></td>
-					<td align="center">
-						<input type="image" src="{img}" onclick="{onclick}; return false;" title="{lang_select_group}">
-					</td>
-				</tr>
-<!-- END group_cal -->
-
-<!-- BEGIN group_other -->
-
-				<tr class="{tr_color}">
-					<td><a href="{link_user_group}" title="{lang_list_members}">{name_user_group}</a></td>
-				</tr>
-
-<!-- END group_other -->
-
-<!-- BEGIN all_intro -->
-				<tr height="5">
-					<td>&nbsp;</td>
-				</tr>
-				<tr>
-					<td class="th" colspan="2">{lang_nonperm}</td>
-				</tr>
-
-<!-- END all_intro -->
-
-<!-- BEGIN group_all -->
-
-				<tr class="{tr_color}">
-					<td colspan="2"><a href="{link_all_group}" title="{lang_list_members}">{name_all_group}</a></td>
-				</tr>
-
-<!-- END group_all -->
-
-
-			</table>
-		</td>
-		<td valign="top">
-			<table border="0" width="100%" cellpadding="2" cellspacing="2">
-				<tr class="th">
-					<td width="100%" class="th" align="center" colspan="4"><b>{lang_accounts}</b></td>
-				</tr>
-				<tr class="th">
-					<td align="center">{sort_lid}</td>
-					<td align="center">{sort_firstname}</td>
-					<td align="center">{sort_lastname}</td>
-					<td width="10%">&nbsp;</td>
-				</tr>
-
-<!-- BEGIN accounts_list -->
-
-	<tr class="{tr_color}">
-		<td>{lid}</td>
-		<td>{firstname}</td>
-		<td>{lastname}</td>
-		<td align="center">
-			<input type="image" src="{img}" onclick="{onclick}; return false;" title="{lang_select_user}">
-		</td>
-	</tr>
-
-<!-- END accounts_list -->
-
-			</table>
-		</td>
-		<td valign="top">
-			<table border="0" width="100%" cellpadding="2" cellspacing="2">
-				<tr class="th">
-					<td align="center" colspan="2"><b>{lang_selection}</b> {remove}</td>
-				</tr>
-				<tr class="row_off">
-					<td align="center">
-						{selection}
-					</td>
-				</tr>
-				<tr>
-					<td align="center" colspan="2">
-						<input type="button" name="close" value="{lang_close}" onClick="window.close()">
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-</div>
-
Index: trunk/expressoMail1_2/templates/classic/preferences.tpl
===================================================================
--- trunk/expressoMail1_2/templates/classic/preferences.tpl	(revision 1151)
+++ trunk/expressoMail1_2/templates/classic/preferences.tpl	(revision 1151)
@@ -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: trunk/expressoMail1_2/templates/classic/offline_preferences.tpl
===================================================================
--- trunk/expressoMail1_2/templates/classic/offline_preferences.tpl	(revision 1151)
+++ trunk/expressoMail1_2/templates/classic/offline_preferences.tpl	(revision 1151)
@@ -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: trunk/expressoMail1_2/templates/classic/config.tpl
===================================================================
--- trunk/expressoMail1_2/templates/classic/config.tpl	(revision 1151)
+++ trunk/expressoMail1_2/templates/classic/config.tpl	(revision 1151)
@@ -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: trunk/expressoMail1_2/templates/classic/index.tpl
===================================================================
--- trunk/expressoMail1_2/templates/classic/index.tpl	(revision 1151)
+++ trunk/expressoMail1_2/templates/classic/index.tpl	(revision 1151)
@@ -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: trunk/expressoMail1_2/templates/classic/index_offline.tpl
===================================================================
--- trunk/expressoMail1_2/templates/classic/index_offline.tpl	(revision 1151)
+++ trunk/expressoMail1_2/templates/classic/index_offline.tpl	(revision 1151)
@@ -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: trunk/expressoMail1_2/templates/classic/import.tpl
===================================================================
--- trunk/expressoMail1_2/templates/classic/import.tpl	(revision 1151)
+++ trunk/expressoMail1_2/templates/classic/import.tpl	(revision 1151)
@@ -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: trunk/expressoMail1_2/templates/classic/login_offline.tpl
===================================================================
--- trunk/expressoMail1_2/templates/classic/login_offline.tpl	(revision 1151)
+++ trunk/expressoMail1_2/templates/classic/login_offline.tpl	(revision 1151)
@@ -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: trunk/expressoMail1_2/templates/classic/signature-example.tpl
===================================================================
--- trunk/expressoMail1_2/templates/classic/signature-example.tpl	(revision 1151)
+++ trunk/expressoMail1_2/templates/classic/signature-example.tpl	(revision 1151)
@@ -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: trunk/expressoMail1_2/templates/classic/main.css
===================================================================
--- trunk/expressoMail1_2/templates/classic/main.css	(revision 1151)
+++ trunk/expressoMail1_2/templates/classic/main.css	(revision 1151)
@@ -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: trunk/expressoMail1_2/templates/classic/error.html
===================================================================
--- trunk/expressoMail1_2/templates/classic/error.html	(revision 1151)
+++ trunk/expressoMail1_2/templates/classic/error.html	(revision 1151)
@@ -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>
Index: trunk/expressoMail1_2/templates/default/index.tpl
===================================================================
--- trunk/expressoMail1_2/templates/default/index.tpl	(revision 1121)
+++ trunk/expressoMail1_2/templates/default/index.tpl	(revision 1151)
@@ -10,23 +10,10 @@
 <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">
+		<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'>
+						<tr><td 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">
+								<tr><td><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)">
@@ -34,7 +21,18 @@
 					</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">
+						<img valign="center" align="center" src="templates/default/images/users.png">
 					</a>
-				</div>
+						</td></tr>
+								<tr height="24"><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 height="24"><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 height="24"><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:0px">
+							<div id="content_folders" class="folders_degrade" style="height:100%;overflow:auto"></div>
+						</td></tr>
+					</tbody>
+				</table>
 				<script type="text/javascript">
 					
@@ -65,5 +63,5 @@
 				</script>
 			</td>
-			<td width="2px">&nbsp;</td>			
+			<td class="whiteSpace">&nbsp;</td>			
 			<td width="*" valign="top" align="left">
 				<div id="exmail_main_body" class="messagescol">
Index: trunk/expressoMail1_2/templates/default/main.css
===================================================================
--- trunk/expressoMail1_2/templates/default/main.css	(revision 993)
+++ trunk/expressoMail1_2/templates/default/main.css	(revision 1151)
@@ -1,7 +1,7 @@
 * {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-
-.checkbox {
+	font-family: Verdana, Arial, Helvetica, sans-serif;	
+}
+
+.checkbox{
 	border:none !important;
 }
@@ -10,4 +10,7 @@
 	font-family: Verdana, Arial, Helvetica, sans-serif;
 	font-size: 13px;
+}
+.whiteSpace{
+	width: 2px;
 }
 
@@ -17,6 +20,6 @@
 	background: #ffffff;
 	border-style: solid;
-	border-width: 1px;
-	border-color: #bbbbbb;
+	border-width: 0px;
+	border-color: #ffffff;
 	font-family: Arial;
 	font-size: 13px;
@@ -25,26 +28,29 @@
 
 .em_div_write_msg{
-	height: 16px;
-	background: #f7f8fa;
-}
-
+	height: 24px;
+	background: transparent;
+}
 
 /* begin class msgs */
+.td_msg{
+	border-width: 0px;	
+}
 .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;
+}
+.tr_msg_read {
+	color: #3f3f3f;
 	background-color: #ffffff;
-	border-bottom:1px solid #cfcfcf;
-    -moz-user-select: none;
+	-moz-user-select: none;
+}
+
+.tr_msg_read2 {
+	color: #3f3f3f;
+	background-color: #f4f8fb;
+	-moz-user-select: none;
 }
 
 .selected_msg{
-	background-color: #ffffcc !important;
+	background-color: #ffffcb;
 }
 .flagged_msg{
@@ -53,5 +59,5 @@
 .selected_shortcut_msg{
 	color: white;
-	background-color: #5194d2 !important;
+	background-color: #5194d2;
 }
 .show_img_link{
@@ -85,5 +91,5 @@
 
 .message_header{
-	background-color: #CCCCCC;
+	background-color: #ABC6E1;
 }
 
@@ -103,6 +109,6 @@
     text-decoration: none;
     text-align: center;
-    font: bold 13px Lucidatypewriter,monospace;
-    color: #505050;
+/*    font: bold 13px Lucidatypewriter,monospace;*/
+    color: #000;
 }
 
@@ -120,12 +126,11 @@
     text-align: center;
     font: bold 13px Lucidatypewriter,monospace;
-   	color:#0000FF;
+    color:#0000FF;
     height: 20px;
-	width:220px;
-    background-color: #F7F7F7;
+    width:220px;
+    background-color:#F7F7F7;
     margin-bottom: 0px;
-    border-left: 1px solid #000000;
-    border-top: 1px solid #000000;
-    border-right: 1px solid #000000;
+    border: 1px solid #4a79b1;
+    border-bottom: 0px;
     padding:0px 5px 0px 0px;
     -moz-border-radius: 9px 9px 0px 0px;
@@ -137,15 +142,14 @@
     text-decoration: none;
     text-align: center;
-    font: bold 13px Lucidatypewriter,monospace;
-    color: #505050;
+/*    font: bold 13px Lucidatypewriter,monospace;*/
     height: 20px;    
-	width:220px;
-    background-color:#E5E5E5;
+    width:220px;
+        background-color:#c8d7ea;
+
+/*    background-color: #F7F7F7;*/
     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;
+    border: 1px solid #f4f7fc;
+    border-bottom: 1px solid #4a79b1;
+    padding:0px 5px 0px 0px;
     -moz-border-radius: 9px 9px 0px 0px;
     -moz-user-select: none;
@@ -155,5 +159,5 @@
 .last_menu
 {
-	border-bottom: 1px solid #000000;
+	border-bottom: 1px solid #4a79b1;
 	-moz-border-radius: 0px 0px 0px 0px;
 }
@@ -164,16 +168,13 @@
     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%;
+    padding: 1px;
+    border-left:1px solid #4A79B1;
+    width:99.5%;
+    overflow: none;
     -moz-border-radius: 0px 0px 6px 6px;
 }
 
 .table_message{
-	background-color: #CCCCCC;
+	background-image: url(../../../phpgwapi/templates/default/images/fundo_topo.png);
 	padding: 1px;
 	cursor: default;
@@ -319,5 +320,5 @@
 {
 	text-align: center;
-    text-decoration: none;
+	text-decoration: none;
 	font: bold 12px Verdana, Arial, Helvetica, sans-serif;
 	color: rgb(0, 102, 51);
@@ -327,33 +328,29 @@
 	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;
+	border-top: 1px solid #000000;	
+	cursor: default;
+	-moz-border-radius: 9px 9px 0px 0px;
+}
+
+.content-menu{
+	padding: 0px 0px 0px 0px;
+	background-image: url(../../../phpgwapi/templates/default/images/bgBlockContent.jpg);
 }
 .content-menu-td {
-	border: 1px solid #f7f7f7;
+/*	border: 1px solid #f7f7f7;*/
 }
 
 .content-folders {
+	width:162px;
 	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;
-
+	background-image: url(../../../phpgwapi/templates/default/images/folder_bg.png);
 	position: relative;
 	overflow: auto;
+	
+}
+
+.folders_degrade {
+	  background-image: url(../../../phpgwapi/templates/default/images/degrade.png);	 
+	  background-repeat: repeat-x;
 }
 
@@ -373,35 +370,63 @@
 	white-space: nowrap;
 }
+.message_options_trash {
+	background-image: url(../../../phpgwapi/templates/default/images/foldertree_trash.png);
+	background-repeat: no-repeat;
+	background-position:left center;
+	padding:0pt 6pt 1pt 14pt;
+}
+.message_options_move {
+	background-image: url(images/move.png);
+	background-repeat: no-repeat;
+	background-position:left center;
+	padding:0pt 6pt 1pt 14pt;
+}
+.message_options_print {
+	background-image: url(images/print.png);
+	background-repeat: no-repeat;
+	background-position:left center;
+	padding:0pt 6pt 1pt 14pt;
+}
+
+.message_options_export {
+	background-image: url(images/export.png);
+	background-repeat: no-repeat;
+	background-position:left center;
+	padding:0pt 6pt 1pt 14pt;
+}
+
+.message_options_import {
+	background-image: url(images/import.png);
+	background-repeat: no-repeat;
+	background-position:left center;
+	padding:0pt 6pt 1pt 14pt;
+}
+
+.message_options_inactive {
+         white-space: nowrap;
+	 color: #999;
+}
+
+.message_options_active {
+	white-space: nowrap;
+	color: #990000;
+        font-weight: bold;
+	cursor: pointer;
+ }
 
 .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;
+        color: #114fa4;
+/*	color: #2A64B0;*/
 	white-space: nowrap;
 	font-weight: bold;
-	text-decoration: underline;
+}
+
+.message_options_over {
+	 cursor: pointer;
+         white-space: nowrap;
+	 color: #FC6103;
+	/*text-decoration: underline;*/
+         font-weight: bold;
 }
 
@@ -464,28 +489,18 @@
 	margin: 0px !important;
 	padding:0px !important;
-	color:blue !important;
+	color:#114fa4 !important;
 	background:transparent none repeat scroll 0% !important;
 	font-family:Verdana,Arial,Helvetica,sans-serif !important;
 	font-size:11px !important;
 	height:15px !important;
-}
-
-
+	font-weight: bold;
+}
 
 .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;
-}
+	background-image: url(../../../phpgwapi/templates/default/images/foldertree_folder.png);
+}
+
 .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;
-}
+	background-image: url(../../../phpgwapi/templates/default/images/foldertree_folderopen.png);
+
+}
