Index: branches/2.0/phpgwapi/templates/classic/help.tpl
===================================================================
--- branches/2.0/phpgwapi/templates/classic/help.tpl	(revision 1863)
+++ branches/2.0/phpgwapi/templates/classic/help.tpl	(revision 1863)
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<HTML>
+<!-- BEGIN login_form -->
+<HEAD>
+<TITLE>{website_title}</TITLE>
+<BODY>
+<div id="conteudo">
+{login_help}
+</div>
+</BODY>
+</HTML>
Index: branches/2.0/phpgwapi/templates/classic/login_classic.php
===================================================================
--- branches/2.0/phpgwapi/templates/classic/login_classic.php	(revision 1718)
+++ branches/2.0/phpgwapi/templates/classic/login_classic.php	(revision 1863)
@@ -333,4 +333,10 @@
 	$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->add_app('loginhelp',$_GET['lang']);		
+	if(lang('loginhelp_message') != 'loginhelp_message*' && trim(lang('loginhelp_message')) != ""){					
+		$tmpl->set_var('lang_help',lang("Help"));	
+	}
+	else 
+		$tmpl->set_var('display_help','none');
 	$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'));
Index: branches/2.0/phpgwapi/templates/classic/login.tpl
===================================================================
--- branches/2.0/phpgwapi/templates/classic/login.tpl	(revision 1743)
+++ branches/2.0/phpgwapi/templates/classic/login.tpl	(revision 1863)
@@ -8,5 +8,5 @@
 <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">
+<link href="phpgwapi/templates/{template}/login.css" rel="stylesheet" type="text/css">
 <TITLE>{website_title} - {lang_login}</TITLE>
 <script language="Javascript">
@@ -75,5 +75,5 @@
 					    <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>
+						<td width="43" rowspan="3" colspan=2><img src="phpgwapi/templates/{template}/images/icon_login.gif" width="43" height="64"></td>
 					  </tr>
 					  <tr>
@@ -89,7 +89,9 @@
 						</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="66">
+			  				<div style="margin-left:10px;display:{display_help}">
+			  					<a title="{lang_help}" target="help" href="./help.php?lang={lang}"><font size="-1">{lang_help}</font></a>
+			  				</div>
+          				</td>
 						<td width="135">&nbsp;</td>
 						<td>&nbsp;</td>		
@@ -103,9 +105,9 @@
       </div>
       </td>		
-    <td valign="bottom" bgcolor="#e8eef7"><div align="left"><img src="phpgwapi/templates/celepar/images/logo_expresso_1.gif" alt=""></div></td>
+    <td valign="bottom" bgcolor="#e8eef7"><div align="left"><img src="phpgwapi/templates/{template}/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>
+    <td background="phpgwapi/templates/{template}/images/logo_expresso_4.gif"><div align="right"><img src="phpgwapi/templates/{template}/images/logo_expresso_3.gif" alt="" height="46" width="485"></div></td>		
+    <td background="phpgwapi/templates/{template}/images/logo_expresso_5.gif"><div align="left"><img src="phpgwapi/templates/{template}/images/logo_expresso_2.gif" alt="" height="46" width="285"></div></td>
 	</tr>	
 	<tr>	
Index: branches/2.0/phpgwapi/templates/default/help.tpl
===================================================================
--- branches/2.0/phpgwapi/templates/default/help.tpl	(revision 1151)
+++ branches/2.0/phpgwapi/templates/default/help.tpl	(revision 1863)
@@ -3,11 +3,5 @@
 <!-- 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>
+<TITLE>{website_title}</TITLE>
 <BODY>
 <div id="conteudo">
Index: branches/2.0/phpgwapi/templates/default/login.css
===================================================================
--- branches/2.0/phpgwapi/templates/default/login.css	(revision 1151)
+++ branches/2.0/phpgwapi/templates/default/login.css	(revision 1863)
@@ -112,13 +112,15 @@
 
 .ajuda {
-	text-align:left;
-	padding-top: 15px;
-	margin-left:50px;
+	text-align:left;	
+	padding-left:11px;		        
+	padding-top:9px;
 }
 .ajuda a {
         font-family:  Arial, Verdana,Helvetica, sans-serif;
         font-size:11px;
-        color: #FFF;
-        font-weight:bold;
+        color: #FFF !important;                
+        margin-top:10px;
+        margin-left:11px;
+        font-weight:bold;                
         text-decoration:none;
 }
Index: branches/2.0/phpgwapi/templates/default/login_default.php
===================================================================
--- branches/2.0/phpgwapi/templates/default/login_default.php	(revision 1716)
+++ branches/2.0/phpgwapi/templates/default/login_default.php	(revision 1863)
@@ -344,4 +344,12 @@
 	$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->add_app('loginhelp',$_GET['lang']);		
+	if(lang('loginhelp_message') != 'loginhelp_message*' && trim(lang('loginhelp_message')) != ""){					
+		$tmpl->set_var('lang_help',lang("Help"));	
+	}
+	else 
+		$tmpl->set_var('display_help','none');
+	
 	$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'));
Index: branches/2.0/phpgwapi/templates/default/login.tpl
===================================================================
--- branches/2.0/phpgwapi/templates/default/login.tpl	(revision 1716)
+++ branches/2.0/phpgwapi/templates/default/login.tpl	(revision 1863)
@@ -83,5 +83,5 @@
           </div>
           <div id="rodape_login">
-	    <div class="ajuda"><a target="help" href="./phpgwapi/templates/{template}/help.php?lang={lang}">Ajuda</a></div>
+	    	<div class="ajuda" style="display:{display_help}"><img align='center' src="./phpgwapi/templates/{template}/images/help.png"/><a title="{lang_help}" target="help" href="./help.php?lang={lang}">{lang_help}</a></div>
           </div>
         </div>
Index: branches/2.0/phpgwapi/templates/default/navbar.tpl
===================================================================
--- branches/2.0/phpgwapi/templates/default/navbar.tpl	(revision 1247)
+++ branches/2.0/phpgwapi/templates/default/navbar.tpl	(revision 1863)
@@ -103,5 +103,5 @@
   		<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>
+  		<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" width="16px"><font id="links_bar">{help}</font></a>
   </td>
  </tr>
Index: branches/2.0/phpgwapi/templates/default/help.php
===================================================================
--- branches/2.0/phpgwapi/templates/default/help.php	(revision 1151)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<?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');
-?>
-
