Changeset 1863


Ignore:
Timestamp:
12/17/09 10:14:08 (11 years ago)
Author:
niltonneto
Message:

Ticket #830 - Corrigido problema de exibição do link Ajuda no login.

Location:
branches/2.0
Files:
1 added
9 edited
1 moved

Legend:

Unmodified
Added
Removed
  • branches/2.0/help.php

    r1151 r1863  
    77        'noheader'               => True 
    88); 
    9         require_once('../../../header.inc.php'); 
     9        require_once('./header.inc.php'); 
    1010        $GLOBALS['phpgw_info']['server']['template_dir'] = PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['login_template_set']; 
    1111        $tmpl = CreateObject('phpgwapi.Template', $GLOBALS['phpgw_info']['server']['template_dir']); 
    1212        $tmpl->set_file(array('login_form' => 'help.tpl')); 
    1313        $tmpl->set_var('website_title', $GLOBALS['phpgw_info']['server']['site_title']); 
    14         $tmpl->set_var('template_set',$GLOBALS['phpgw_info']['login_template_set']); 
     14    $tmpl->set_var('template_set',$GLOBALS['phpgw_info']['login_template_set']); 
    1515        $GLOBALS['phpgw']->translation->init(); 
    1616        $GLOBALS['phpgw']->translation->add_app('loginhelp'); 
  • branches/2.0/phpgwapi/templates/classic/login.tpl

    r1743 r1863  
    88<META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW"> 
    99<META NAME="keywords" CONTENT="{website_title} login screen, eGroupWare, groupware, groupware suite"> 
    10 <link href="phpgwapi/templates/celepar/login.css" rel="stylesheet" type="text/css"> 
     10<link href="phpgwapi/templates/{template}/login.css" rel="stylesheet" type="text/css"> 
    1111<TITLE>{website_title} - {lang_login}</TITLE> 
    1212<script language="Javascript"> 
     
    7575                                            <tr><td width="96" class="loginLabel" align="right">{lang_username}:&nbsp;</td> 
    7676                                                <td width="96"><input name="user" size="15"></td> 
    77                                                 <td width="43" rowspan="3" colspan=2><img src="phpgwapi/templates/celepar/images/icon_login.gif" width="43" height="64"></td> 
     77                                                <td width="43" rowspan="3" colspan=2><img src="phpgwapi/templates/{template}/images/icon_login.gif" width="43" height="64"></td> 
    7878                                          </tr> 
    7979                                          <tr> 
     
    8989                                                </tr> 
    9090                                          <tr>   
    91                                                 <td width="66">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 
    92                                                         <!--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')"> 
    93                                                                 <font size="-1"> Ajuda</font></a--></td> 
     91                                                <td width="66"> 
     92                                                        <div style="margin-left:10px;display:{display_help}"> 
     93                                                                <a title="{lang_help}" target="help" href="./help.php?lang={lang}"><font size="-1">{lang_help}</font></a> 
     94                                                        </div> 
     95                                        </td> 
    9496                                                <td width="135">&nbsp;</td> 
    9597                                                <td>&nbsp;</td>          
     
    103105      </div> 
    104106      </td>              
    105     <td valign="bottom" bgcolor="#e8eef7"><div align="left"><img src="phpgwapi/templates/celepar/images/logo_expresso_1.gif" alt=""></div></td> 
     107    <td valign="bottom" bgcolor="#e8eef7"><div align="left"><img src="phpgwapi/templates/{template}/images/logo_expresso_1.gif" alt=""></div></td> 
    106108        </tr> 
    107109        <tr>             
    108     <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>                
    109     <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> 
     110    <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>          
     111    <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> 
    110112        </tr>    
    111113        <tr>     
  • branches/2.0/phpgwapi/templates/classic/login_classic.php

    r1718 r1863  
    333333        $tmpl->set_var('website_title', $GLOBALS['phpgw_info']['server']['site_title']); 
    334334        $tmpl->set_var('template_set',$GLOBALS['phpgw_info']['login_template_set']); 
     335        $GLOBALS['phpgw']->translation->add_app('loginhelp',$_GET['lang']);              
     336        if(lang('loginhelp_message') != 'loginhelp_message*' && trim(lang('loginhelp_message')) != ""){                                  
     337                $tmpl->set_var('lang_help',lang("Help"));        
     338        } 
     339        else  
     340                $tmpl->set_var('display_help','none'); 
    335341        $tmpl->set_var('bg_color',($GLOBALS['phpgw_info']['server']['login_bg_color']?$GLOBALS['phpgw_info']['server']['login_bg_color']:'FFFFFF')); 
    336342        $tmpl->set_var('bg_color_title',($GLOBALS['phpgw_info']['server']['login_bg_color_title']?$GLOBALS['phpgw_info']['server']['login_bg_color_title']:'486591')); 
  • branches/2.0/phpgwapi/templates/default/help.tpl

    r1151 r1863  
    33<!-- BEGIN login_form --> 
    44<HEAD> 
    5 <META http-equiv="Content-Type" content="text/html; charset={charset}"> 
    6 <META name="AUTHOR" content="dGroupWare http://www.eGroupWare.org"> 
    7 <META NAME="description" CONTENT="{website_title} login screen, working environment powered by eGroupWare"> 
    8 <META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW"> 
    9 <META NAME="keywords" CONTENT="{website_title} login screen, eGroupWare, groupware, groupware suite"> 
    10 <link href="./login.css" rel="stylesheet" type="text/css"> 
    11 <TITLE>{website_title} - {lang_login}</TITLE> 
     5<TITLE>{website_title}</TITLE> 
    126<BODY> 
    137<div id="conteudo"> 
  • branches/2.0/phpgwapi/templates/default/login.css

    r1151 r1863  
    112112 
    113113.ajuda { 
    114         text-align:left; 
    115         padding-top: 15px; 
    116         margin-left:50px; 
     114        text-align:left;         
     115        padding-left:11px;                       
     116        padding-top:9px; 
    117117} 
    118118.ajuda a { 
    119119        font-family:  Arial, Verdana,Helvetica, sans-serif; 
    120120        font-size:11px; 
    121         color: #FFF; 
    122         font-weight:bold; 
     121        color: #FFF !important;                 
     122        margin-top:10px; 
     123        margin-left:11px; 
     124        font-weight:bold;                 
    123125        text-decoration:none; 
    124126} 
  • branches/2.0/phpgwapi/templates/default/login.tpl

    r1716 r1863  
    8383          </div> 
    8484          <div id="rodape_login"> 
    85             <div class="ajuda"><a target="help" href="./phpgwapi/templates/{template}/help.php?lang={lang}">Ajuda</a></div> 
     85                <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> 
    8686          </div> 
    8787        </div> 
  • branches/2.0/phpgwapi/templates/default/login_default.php

    r1716 r1863  
    344344        $tmpl->set_var('website_title', $GLOBALS['phpgw_info']['server']['site_title']); 
    345345        $tmpl->set_var('template_set',$GLOBALS['phpgw_info']['login_template_set']); 
     346         
     347        $GLOBALS['phpgw']->translation->add_app('loginhelp',$_GET['lang']);              
     348        if(lang('loginhelp_message') != 'loginhelp_message*' && trim(lang('loginhelp_message')) != ""){                                  
     349                $tmpl->set_var('lang_help',lang("Help"));        
     350        } 
     351        else  
     352                $tmpl->set_var('display_help','none'); 
     353         
    346354        $tmpl->set_var('bg_color',($GLOBALS['phpgw_info']['server']['login_bg_color']?$GLOBALS['phpgw_info']['server']['login_bg_color']:'FFFFFF')); 
    347355        $tmpl->set_var('bg_color_title',($GLOBALS['phpgw_info']['server']['login_bg_color_title']?$GLOBALS['phpgw_info']['server']['login_bg_color_title']:'486591')); 
  • branches/2.0/phpgwapi/templates/default/navbar.tpl

    r1247 r1863  
    103103                <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> 
    104104                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 
    105                 <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> 
     105                <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> 
    106106  </td> 
    107107 </tr> 
Note: See TracChangeset for help on using the changeset viewer.