Show
Ignore:
Timestamp:
12/05/07 20:53:40 (15 years ago)
Author:
exi
Message:

Merging 242:253 branch into dev

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • dev/templates/killlisttable.tpl

    r154 r254  
    66    <tr class="kb-table-header"> 
    77        <td class="kb-table-header" colspan="2" align="center">Ship type</td> 
    8         <td class="kb-table-header">Victim</td> 
     8        <td class="kb-table-header"{if $config->get('killlist_alogo')} colspan="2"{/if}>Victim</td> 
    99        <td class="kb-table-header">Final blow</td> 
    1010        <td class="kb-table-header" align="center">System</td> 
     
    2121        <td width="32" align="center"><img src="{$k.victimshipimage}" border="0" width="32" heigth="32"></td> 
    2222        <td height="34" width=150 valign="middle"><div class="kb-shiptype"><b>{$k.victimshipname}</b><br>{$k.victimshipclass}</div><div class="kb-shipicon"><img src="{$k.victimshipindicator}" border="0"></div></td> 
     23        {if $config->get('killlist_alogo')} 
     24            {if $k.allianceexists} 
     25            <td width="32" align="center"><img src="{$img_url}/alliances/{$k.victimallianceicon}.png" border="0" width="32" height="32"></td> 
     26            {elseif $k.victimalliancename != "None"} 
     27            <td width="32" align="center"><img src="{$img_url}/alliances/default.gif" border="0" width="32" height="32"></td> 
     28            {else} 
     29            <td width="32" align="center">&nbsp;</td> 
     30            {/if} 
     31        {/if} 
    2332        <td width="200" class="kb-table-cell"><b>{$k.victim}</b><br/>{$k.victimcorp|truncate:30}</td> 
    2433        <td width="200" class="kb-table-cell"><b>{$k.fb}</b><br>{$k.fbcorp|truncate:30}</td>