--- templates/show.tpl	2001/10/04 14:59:35	1.9
+++ templates/show.tpl	2001/10/10 12:40:59	1.10
@@ -1,19 +1,8 @@
-{if ($titlepic_url && ($titlepic_type == 1 || $titlepic_type == 2 || $titlepic_type == 3))}
-  <p align={if ($titlepic_type == 1)}left{/if}{if ($titlepic_type == 2)}center{/if}{if ($titlepic_type == 3)}right{/if}><img src="{$newspicdir}{$titlepic_url}" border=0 alt="{$titlepic_alt}"{if ($titlepic_width)} width={$titlepic_width}{/if}{if ($titlepic_height)} height={$titlepic_height}{/if}></p>
-{/if}
-{if ($title)}<span class="{if ($cat == 't')}topictitle{elseif ($cat == 'w')}newsworldtitle{elseif ($cat == 'p')}newsplivatitle{else}maintitle{/if}">{$title}</span><br>{/if}
 {if ($date)}<small>Objavljeno: {$date}</small><br>{/if}
+{if ($title)}<span class="{if ($cat == 't')}topictitle{elseif ($cat == 'w')}newsworldtitle{elseif ($cat == 'p')}newsplivatitle{else}maintitle{/if}">{$title}</span><br>{/if}
 <table border=0 cellspacing=0 cellpadding=0 width="100%"><tr><td align=left valign=middle>
-{if ($titlepic_url && ($titlepic_type == 4 || $titlepic_type == 5))}
-  {if ($titlepic_type == 4)}<img src="{$newspicdir}{$titlepic_url}" border=0 hspace=5 vspace=5 alt="{$titlepic_alt}"{if ($titlepic_width)} width={$titlepic_width}{/if}{if ($titlepic_height)} height={$titlepic_height}{/if} align=left>{/if}
-  {if ($titlepic_type == 5)}<img src="{$newspicdir}{$titlepic_url}" border=0 hspace=5 vspace=5 alt="{$titlepic_alt}"{if ($titlepic_width)} width={$titlepic_width}{/if}{if ($titlepic_height)} height={$titlepic_height}{/if} align=right>{/if}
-{/if}
-{if ($lead)}<span class="{if ($cat == 't')}topicsubtitle{elseif ($cat == 'w')}newsworldsubtitle{elseif ($cat == 'p')}newsplivasubtitle{else}mainsubtitle{/if}">{$lead}</span><br>{/if}
-<br>
+{if ($lead)}<span class="{if ($cat == 't')}topicsubtitle{elseif ($cat == 'w')}newsworldsubtitle{elseif ($cat == 'p')}newsplivasubtitle{else}mainsubtitle{/if}">{if ($pgfs)}<b>{/if}{$lead}{if ($pgfs)}</b>{/if}</span><br>{/if}
 </td></tr></table>
-{if ($titlepic_url && ($titlepic_type == 6 || $titlepic_type == 7 || $titlepic_type == 8))}
-  <p align={if ($titlepic_type == 6)}left{/if}{if ($titlepic_type == 7)}center{/if}{if ($titlepic_type == 8)}right{/if}><img src="{$newspicdir}{$titlepic_url}" border=0 alt="{$titlepic_alt}"{if ($titlepic_width)} width={$titlepic_width}{/if}{if ($titlepic_height)} height={$titlepic_height}{/if}></p>
-{/if}
 
 {if ($text)}
 <br>
@@ -24,7 +13,6 @@
 {/section}
 {/if}
 
-<br>
 {section name=i loop=$text}
 {if ($i/text.pic && ($i/text.pos == 1 || $i/text.pos == 2 || $i/text.pos == 3))}
   <p align={if ($i/text.pos == 1)}left{/if}{if ($i/text.pos == 2)}center{/if}{if ($i/text.pos == 3)}right{/if}><table border=0 cellspacing=0 cellpadding=0><tr><td>{if ($i/text.full)}{$i/text.full}{/if}<img src="{$newspicdir}{$i/text.pic}" border=0 alt="{$i/text.alt}"{if ($i/text.w)} width={$i/text.w}{/if}{if ($i/text.h)} height={$i/text.h}{/if}>{if ($i/text.full)}</a>{/if}</td></tr>{if ($i/text.exp)}<tr><td align=center><b>{$i/text.exp}</b></td></tr>{/if}</table></p>
@@ -43,10 +31,10 @@
 {if ($i/text.pic && ($i/text.pos == 6 || $i/text.pos == 7 || $i/text.pos == 8))}
   <p align={if ($i/text.pos == 6)}left{/if}{if ($i/text.pos == 7)}center{/if}{if ($i/text.pos == 8)}right{/if}><table border=0 cellspacing=0 cellpadding=0><tr><td>{if ($i/text.full)}{$i/text.full}{/if}<img src="{$newspicdir}{$i/text.pic}" border=0 alt="{$i/text.alt}"{if ($i/text.w)} width={$i/text.w}{/if}{if ($i/text.h)} height={$i/text.h}{/if}>{if ($i/text.full)}</a>{/if}</td></tr>{if ($i/text.exp)}<tr><td align=center><b>{$i/text.exp}</b></td></tr>{/if}</table></p>
 {/if}
-<br><br>
+<br>
 {/section}
 <table border=0 cellspacing=0 cellpadding=0 width="100%"><tr>
 {if ($title_url)}<td align=right valign=middle><small><a href="{$title_url}" class="more"{if ($title_url_new)} target="_blank"{/if}>{if ($title_url_title)}{$title_url_title}{else}više...{/if}</a></td></tr>{/if}
-<td align=left valign=middle><small>[ <a href="?section={$section}&amp;section_menu={$section_menu}&amp;section_menu2={$section_menu2}{if ($spec)}&amp;spec={$spec}{/if}{if ($offset)}&amp;offset={$offset}{/if}{if ($acat)}&amp;acat={$acat}{/if}{if ($acat2)}&amp;acat2={$acat2}{/if}" class="more">&lt;&lt;&nbsp;nazad</a> | <a href="#top" class="more">vrh</a> ]</small></td></tr>
+<td align=left valign=middle><br><small>[ <a href="?section={$section}&amp;section_menu={$section_menu}&amp;section_menu2={$section_menu2}{if ($spec)}&amp;spec={$spec}{/if}{if ($offset)}&amp;offset={$offset}{/if}{if ($acat)}&amp;acat={$acat}{/if}{if ($acat2)}&amp;acat2={$acat2}{/if}" class="more">&lt;&lt;&nbsp;nazad</a> | <a href="#top" class="more">vrh</a> ]</small></td></tr>
 </tr></table><br>
 {$AUTHOR}