Index: /trunk/phpgwapi/templates/canyon/navbar.inc.php
===================================================================
--- /trunk/phpgwapi/templates/canyon/navbar.inc.php	(revision 791)
+++ /trunk/phpgwapi/templates/canyon/navbar.inc.php	(revision 887)
@@ -36,7 +36,8 @@
                 $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/canyon/images';
+		$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'];
@@ -400,5 +401,5 @@
 			else
 			{
-				$var['icon_or_star']='<img src="'.$GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/canyon/images'.'/orange-ball.png" width="9" height="9" alt="ball"/>';
+				$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))
@@ -437,5 +438,5 @@
 			
 			$var = Array(
-				'img_root'       => $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/canyon/images',
+				'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']
Index: /trunk/phpgwapi/templates/canyon/navbar.tpl
===================================================================
--- /trunk/phpgwapi/templates/canyon/navbar.tpl	(revision 791)
+++ /trunk/phpgwapi/templates/canyon/navbar.tpl	(revision 887)
@@ -99,9 +99,9 @@
   <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/canyon/images/preferences.png"><font id="links_bar">{my_preferences}</font></a>
+  		<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/canyon/images/critic.png"><font id="links_bar">{suggestions}</font></a>
+  		<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/canyon/images/help.png"><font id="links_bar">{help}</font></a>
+  		<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>
Index: unk/phpgwapi/templates/canyon/navbar.tpl.95
===================================================================
--- /trunk/phpgwapi/templates/canyon/navbar.tpl.95	(revision 791)
+++ 	(revision )
@@ -1,162 +1,0 @@
-<!-- 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} - 01</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="Clique aqui para alterar sua senha do Expresso e demais prefer&ecirc;ncias" alt="Clique aqui para alterar sua senha do Expresso e demais prefer&ecirc;ncias" onmouseover="javascript:self.status='Envie suas Cr&iacute;ticas, D&uacute;vidas ou Sugest&otilde;es sobre o Expresso Livre'" onmouseout="javascript:self.status=''"><img height="15px" src="{dir_root}/phpgwapi/templates/celepar/images/preferences.png"><font size="-1">Minhas Prefer&ecirc;ncias</font></a>
-  		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 
-  		<a href="#" title="Clique aqui para enviar Cr&iacute;ticas, D&uacute;vidas ou Sugest&otilde;es" alt="Clique aqui para enviar Cr&iacute;ticas, D&uacute;vidas ou Sugest&otilde;es" onmouseover="javascript:self.status='Envie suas Cr&iacute;ticas, D&uacute;vidas ou Sugest&otilde;es sobre o Expresso Livre'" onmouseout="javascript:self.status=''" onclick="javascript:openWindow(400,550,'{dir_root}/help/enviasugestao.php')"><img src="{dir_root}/help/templates/celepar/images/criticas.jpg"><font size="-1"> Sugest&otilde;es</font></a>
-  		&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,'{dir_root}/help')"><img src="{dir_root}/help/templates/celepar/images/ajuda.jpg"><font size="-1">Ajuda</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: unk/phpgwapi/templates/canyon/nextmatchs.tpl
===================================================================
--- /trunk/phpgwapi/templates/canyon/nextmatchs.tpl	(revision 791)
+++ 	(revision )
@@ -1,99 +1,0 @@
-<!-- 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/fozi/navbar.inc.php
===================================================================
--- /trunk/phpgwapi/templates/fozi/navbar.inc.php	(revision 791)
+++ /trunk/phpgwapi/templates/fozi/navbar.inc.php	(revision 887)
@@ -36,7 +36,8 @@
                 $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/fozi/images';
+		$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'];
@@ -400,5 +401,5 @@
 			else
 			{
-				$var['icon_or_star']='<img src="'.$GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/fozi/images'.'/orange-ball.png" width="9" height="9" alt="ball"/>';
+				$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))
@@ -437,5 +438,5 @@
 			
 			$var = Array(
-				'img_root'       => $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/fozi/images',
+				'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']
Index: /trunk/phpgwapi/templates/fozi/navbar.tpl
===================================================================
--- /trunk/phpgwapi/templates/fozi/navbar.tpl	(revision 791)
+++ /trunk/phpgwapi/templates/fozi/navbar.tpl	(revision 887)
@@ -99,9 +99,9 @@
   <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/fozi/images/preferences.png"><font id="links_bar">{my_preferences}</font></a>
+  		<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/fozi/images/critic.png"><font id="links_bar">{suggestions}</font></a>
+  		<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/fozi/images/help.png"><font id="links_bar">{help}</font></a>
+  		<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>
Index: unk/phpgwapi/templates/fozi/navbar.tpl.95
===================================================================
--- /trunk/phpgwapi/templates/fozi/navbar.tpl.95	(revision 791)
+++ 	(revision )
@@ -1,162 +1,0 @@
-<!-- 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} - 01</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="Clique aqui para alterar sua senha do Expresso e demais prefer&ecirc;ncias" alt="Clique aqui para alterar sua senha do Expresso e demais prefer&ecirc;ncias" onmouseover="javascript:self.status='Envie suas Cr&iacute;ticas, D&uacute;vidas ou Sugest&otilde;es sobre o Expresso Livre'" onmouseout="javascript:self.status=''"><img height="15px" src="{dir_root}/phpgwapi/templates/celepar/images/preferences.png"><font size="-1">Minhas Prefer&ecirc;ncias</font></a>
-  		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 
-  		<a href="#" title="Clique aqui para enviar Cr&iacute;ticas, D&uacute;vidas ou Sugest&otilde;es" alt="Clique aqui para enviar Cr&iacute;ticas, D&uacute;vidas ou Sugest&otilde;es" onmouseover="javascript:self.status='Envie suas Cr&iacute;ticas, D&uacute;vidas ou Sugest&otilde;es sobre o Expresso Livre'" onmouseout="javascript:self.status=''" onclick="javascript:openWindow(400,550,'{dir_root}/help/enviasugestao.php')"><img src="{dir_root}/help/templates/celepar/images/criticas.jpg"><font size="-1"> Sugest&otilde;es</font></a>
-  		&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,'{dir_root}/help')"><img src="{dir_root}/help/templates/celepar/images/ajuda.jpg"><font size="-1">Ajuda</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: unk/phpgwapi/templates/fozi/nextmatchs.tpl
===================================================================
--- /trunk/phpgwapi/templates/fozi/nextmatchs.tpl	(revision 791)
+++ 	(revision )
@@ -1,99 +1,0 @@
-<!-- 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/azul/navbar.inc.php
===================================================================
--- /trunk/phpgwapi/templates/azul/navbar.inc.php	(revision 791)
+++ /trunk/phpgwapi/templates/azul/navbar.inc.php	(revision 887)
@@ -36,7 +36,8 @@
                 $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/azul/images';
+		$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'];
@@ -400,5 +401,5 @@
 			else
 			{
-				$var['icon_or_star']='<img src="'.$GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/azul/images'.'/orange-ball.png" width="9" height="9" alt="ball"/>';
+				$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))
@@ -437,5 +438,5 @@
 			
 			$var = Array(
-				'img_root'       => $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/azul/images',
+				'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']
Index: /trunk/phpgwapi/templates/azul/navbar.tpl
===================================================================
--- /trunk/phpgwapi/templates/azul/navbar.tpl	(revision 791)
+++ /trunk/phpgwapi/templates/azul/navbar.tpl	(revision 887)
@@ -99,9 +99,9 @@
   <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/azul/images/preferences.png"><font id="links_bar">{my_preferences}</font></a>
+  		<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/azul/images/critic.png"><font id="links_bar">{suggestions}</font></a>
+  		<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/azul/images/help.png"><font id="links_bar">{help}</font></a>
+  		<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>
Index: unk/phpgwapi/templates/azul/navbar.tpl.95
===================================================================
--- /trunk/phpgwapi/templates/azul/navbar.tpl.95	(revision 791)
+++ 	(revision )
@@ -1,162 +1,0 @@
-<!-- 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} - 01</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="Clique aqui para alterar sua senha do Expresso e demais prefer&ecirc;ncias" alt="Clique aqui para alterar sua senha do Expresso e demais prefer&ecirc;ncias" onmouseover="javascript:self.status='Envie suas Cr&iacute;ticas, D&uacute;vidas ou Sugest&otilde;es sobre o Expresso Livre'" onmouseout="javascript:self.status=''"><img height="15px" src="{dir_root}/phpgwapi/templates/azul/images/preferences.png"><font size="-1">Minhas Prefer&ecirc;ncias</font></a>
-  		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 
-  		<a href="#" title="Clique aqui para enviar Cr&iacute;ticas, D&uacute;vidas ou Sugest&otilde;es" alt="Clique aqui para enviar Cr&iacute;ticas, D&uacute;vidas ou Sugest&otilde;es" onmouseover="javascript:self.status='Envie suas Cr&iacute;ticas, D&uacute;vidas ou Sugest&otilde;es sobre o Expresso Livre'" onmouseout="javascript:self.status=''" onclick="javascript:openWindow(400,550,'{dir_root}/help/enviasugestao.php')"><img src="{dir_root}/help/templates/azul/images/criticas.jpg"><font size="-1"> Sugest&otilde;es</font></a>
-  		&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,'{dir_root}/help')"><img src="{dir_root}/help/templates/azul/images/ajuda.jpg"><font size="-1">Ajuda</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: unk/phpgwapi/templates/azul/nextmatchs.tpl
===================================================================
--- /trunk/phpgwapi/templates/azul/nextmatchs.tpl	(revision 791)
+++ 	(revision )
@@ -1,99 +1,0 @@
-<!-- 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 -->
-
