--- templates/edit.tpl	2001/10/04 14:59:35	1.11
+++ templates/edit.tpl	2001/10/16 13:07:03	1.16
@@ -20,7 +20,7 @@
   {if ($ed_titlepic_pos == 5)}<img src="{$newspicdir}{$ed_titlepic_url}" border=0 alt="{$ed_titlepic_alt}"{if ($ed_titlepic_width)} width={$ed_titlepic_width}{/if}{if ($ed_titlepic_height)} height={$ed_titlepic_height}{/if} align=right>{/if}
 {/if}
 {if ($ed_title)}<span class="{if ($ed_cat == 't')}topictitle{elseif ($ed_cat == 'w')}newzworld{elseif ($ed_cat == 'p')}newzpliva{else}maintitle{/if}">{$ed_title}</span><br>{/if}
-{if ($ed_lead)}<span class="{if ($ed_cat == 't')}topicsubtitle{elseif ($ed_cat == 'w')}newzworldsub{elseif ($ed_cat == 'p')}newzplivasub{else}mainsubtitle{/if}">{$ed_lead}</span><br>&nbsp;{/if}
+{if ($ed_lead2)}<span class="{if ($ed_cat == 't')}topicsubtitle{elseif ($ed_cat == 'w')}newzworldsub{elseif ($ed_cat == 'p')}newzplivasub{else}mainsubtitle{/if}">{$ed_lead2}</span><br>&nbsp;{/if}
 {if (! $ed_clr_main && $ed_titlepic_url && ($ed_titlepic_pos == 6 || $ed_titlepic_pos == 7 || $ed_titlepic_pos == 8))}
   <p align={if ($ed_titlepic_pos == 6)}left{/if}{if ($ed_titlepic_pos == 7)}center{/if}{if ($ed_titlepic_pos == 8)}right{/if}><img src="{$newspicdir}{$ed_titlepic_url}" border=0 alt="{$ed_titlepic_alt}"{if ($ed_titlepic_width)} width={$ed_titlepic_width}{/if}{if ($ed_titlepic_height)} height={$ed_titlepic_height}{/if}></p>
 {/if}
@@ -34,6 +34,7 @@
 <input type=hidden name="ed_titlepic_url2" value="{$ed_titlepic_url}">
 <input type=hidden name="ed_titlepic_name" value="{$ed_titlepic_name}">
 <input type=hidden name="ed_titlepic_alt" value="{$ed_titlepic_alt}">
+<input type=hidden name="ed_prikazi" value="{$ed_prikazi}">
 {if (! $vijest)}
 <input type=hidden name="ed_author_url" value="{$ed_author_url}">
 <input type=hidden name="ed_author_url2" value="{$ed_author_url}">
@@ -41,6 +42,7 @@
 <input type=hidden name="ed_author_ime" value="{$ed_author_ime}">
 <input type=hidden name="ed_author_alt" value="{$ed_author_alt}">
 <input type=hidden name="ed_author_info" value="{$ed_author_info}">
+<input type=hidden name="ed_author_cv" value="{$ed_author_cv}">
 {/if}
 <input type=hidden name="ed_more" value="{$ed_more}">
 <input type=hidden name="ed_more_title" value="{$ed_more_title}">
@@ -48,20 +50,20 @@
 {if ($ed_trigger)}<input type=hidden name="{$ed_trigger}" value="1">{/if}
 {section name=i loop=$ed_text}
 {if (! $i/ed_text.clr && $i/ed_text.url && ($i/ed_text.pos == 1 || $i/ed_text.pos == 2 || $i/ed_text.pos == 3))}
-  <p align={if ($i/ed_text.pos == 1)}left{/if}{if ($i/ed_text.pos == 2)}center{/if}{if ($i/ed_text.pos == 3)}right{/if}><table border=0 cellspacing=0 cellpadding=0><tr><td>{if ($i/ed_text.full)}{$i/ed_text.full}{/if}<img src="{$newspicdir}{$i/ed_text.url}" border=0 alt="{$i/ed_text.alt}"{if ($i/ed_text.w)} width={$i/ed_text.w}{/if}{if ($i/ed_text.h)} height={$i/ed_text.h}{/if}>{if ($i/ed_text.full)}</a>{/if}</td></tr>{if ($i/ed_text.exp)}<tr><td align=center>{$i/ed_text.exp}</td></tr>{/if}</table></p>
+  <p align={if ($i/ed_text.pos == 1)}left{/if}{if ($i/ed_text.pos == 2)}center{/if}{if ($i/ed_text.pos == 3)}right{/if}><table border=0 cellspacing=0 cellpadding=0><tr><td>{if ($i/ed_text.full)}<a href="{$newspicdir}{$i/ed_text.full}" target="_blank" title="Kliknite za veću sliku" onclick="{$i/ed_text.full|js_popup:"syspicdir"}">{/if}<img src="{$newspicdir}{$i/ed_text.url}" border=0 alt="{$i/ed_text.alt}"{if ($i/ed_text.w)} width={$i/ed_text.w}{/if}{if ($i/ed_text.h)} height={$i/ed_text.h}{/if}>{if ($i/ed_text.full)}</a>{/if}</td></tr>{if ($i/ed_text.exp)}<tr><td align=center>{$i/ed_text.exp}</td></tr>{/if}</table></p>
 {/if}
 <p class="ptitle">{if ($i/ed_text.class)}<span class="{$i/ed_text.class}">{/if}{$i/ed_text.title}{if ($i/ed_text.class)}</span>{/if}</p>
 <table border=0 cellspacing=0 cellpadding=0 width="100%"><tr><td align=left valign=top>
 <p class="ptext">
 {if (! $i/ed_text.clr && $i/ed_text.url && ($i/ed_text.pos == 4 || $i/ed_text.pos == 5))}
-  <table border=0 cellspacing=0 cellpadding=0{if ($i/ed_text.pos == 4)} align=left{/if}{if ($i/ed_text.pos == 5)} align=right{/if}><tr><td>{if ($i/ed_text.full)}{$i/ed_text.full}{/if}<img src="{$newspicdir}{$i/ed_text.url}" border=0 alt="{$i/ed_text.alt}"{if ($i/ed_text.w)} width={$i/ed_text.w}{/if}{if ($i/ed_text.h)} height={$i/ed_text.h}{/if}>{if ($i/ed_text.full)}</a>{/if}</td></tr>{if ($i/ed_text.exp)}<tr><td align=center>{$i/ed_text.exp}</td></tr>{/if}</table>
+  <table border=0 cellspacing=0 cellpadding=0{if ($i/ed_text.pos == 4)} align=left{/if}{if ($i/ed_text.pos == 5)} align=right{/if}><tr><td>{if ($i/ed_text.full)}<a href="{$newspicdir}{$i/ed_text.full}" target="_blank" title="Kliknite za veću sliku" onclick="{$i/ed_text.full|js_popup:"syspicdir"}">{/if}<img src="{$newspicdir}{$i/ed_text.url}" border=0 alt="{$i/ed_text.alt}"{if ($i/ed_text.w)} width={$i/ed_text.w}{/if}{if ($i/ed_text.h)} height={$i/ed_text.h}{/if}>{if ($i/ed_text.full)}</a>{/if}</td></tr>{if ($i/ed_text.exp)}<tr><td align=center>{$i/ed_text.exp}</td></tr>{/if}</table>
 {/if}
 {if ($i/ed_text.hl)}{$i/ed_text.hl}{/if}
 {if ($i/ed_text.txt)}{$i/ed_text.txt}{else}&nbsp;{/if}
 </p>
 </td></tr></table>
 {if (! $i/ed_text.clr && $i/ed_text.url && ($i/ed_text.pos == 6 || $i/ed_text.pos == 7 || $i/ed_text.pos == 8))}
-  <p align={if ($i/ed_text.pos == 6)}left{/if}{if ($i/ed_text.pos == 7)}center{/if}{if ($i/ed_text.pos == 8)}right{/if}><table border=0 cellspacing=0 cellpadding=0><tr><td>{if ($i/ed_text.full)}{$i/ed_text.full}{/if}<img src="{$newspicdir}{$i/ed_text.url}" border=0 alt="{$i/ed_text.alt}"{if ($i/ed_text.w)} width={$i/ed_text.w}{/if}{if ($i/ed_text.h)} height={$i/ed_text.h}{/if}>{if ($i/ed_text.full)}</a>{/if}</td></tr>{if ($i/ed_text.exp)}<tr><td align=center>{$i/ed_text.exp}</td></tr>{/if}</table></p>
+  <p align={if ($i/ed_text.pos == 6)}left{/if}{if ($i/ed_text.pos == 7)}center{/if}{if ($i/ed_text.pos == 8)}right{/if}><table border=0 cellspacing=0 cellpadding=0><tr><td>{if ($i/ed_text.full)}<a href="{$newspicdir}{$i/ed_text.full}" target="_blank" title="Kliknite za veću sliku" onclick="{$i/ed_text.full|js_popup:"syspicdir"}">{/if}<img src="{$newspicdir}{$i/ed_text.url}" border=0 alt="{$i/ed_text.alt}"{if ($i/ed_text.w)} width={$i/ed_text.w}{/if}{if ($i/ed_text.h)} height={$i/ed_text.h}{/if}>{if ($i/ed_text.full)}</a>{/if}</td></tr>{if ($i/ed_text.exp)}<tr><td align=center>{$i/ed_text.exp}</td></tr>{/if}</table></p>
 {/if}
 <input type=hidden name="ed_text_{$i/ed_text.n}" value="{$i/ed_text.txt3}">
 <input type=hidden name="ed_hl_{$i/ed_text.n}" value="{$i/ed_text.hl3}">
@@ -73,11 +75,14 @@
 <input type=hidden name="ed_textpic_alt_{$i/ed_text.n}" value="{$i/ed_text.alt}">
 <input type=hidden name="ed_textpic_pos_{$i/ed_text.n}" value="{$i/ed_text.pos}">
 <input type=hidden name="ed_textpic_exp_{$i/ed_text.n}" value="{$i/ed_text.exp}">
-<input type=hidden name="ed_textpic_full_{$i/ed_text.n}" value="{$i/ed_text.full2}">
+<input type=hidden name="ed_textpic_full_{$i/ed_text.n}" value="{$i/ed_text.full}">
+<input type=hidden name="ed_textpic_full2_{$i/ed_text.n}" value="{$i/ed_text.full}">
+<input type=hidden name="ed_textpic_fname_{$i/ed_text.n}" value="{$i/ed_text.fname}">
 <input type=hidden name="ed_clr_{$i/ed_text.n}" value="{$i/ed_text.clr}">
+<input type=hidden name="ed_fclr_{$i/ed_text.n}" value="{$i/ed_text.fclr}">
 {/section}
-{if ($ed_more)}<p align=right><small>[ <a href="{$ed_more}" class="more"{if ($ed_more_new)} target="_blank"{/if}>{if ($ed_more_title)}{$ed_more_title}{else}više...{/if}</a> ]</small></p>{/if}
-{if (! $vijest)}{$AUTHOR}{/if}
+{if ($ed_more)}<p align=right><small>[ <a href="{$ed_more}" class="more" target="_blank"{if ($ed_more_title)}{$ed_more_title}{else}više...{/if}</a> ]</small></p>{/if}
+{if ($AUTHOR && ! $vijest)}<br>{$AUTHOR}{/if}
 </td></tr>
 <tr bgcolor="#E0E0E0"><td align=right><input type=submit name="ed_edit" value="Re-edit">&nbsp;<input type=submit name=save value="Save"{if ($ed_empty)} disabled{/if}>&nbsp;<input type=submit name=cancel value="Cancel"></td></tr>
 </table>
@@ -126,6 +131,9 @@
 <tr>
 <td align=right valign=bottom><b>URL title:</b></td><td colspan=3 align=left valign=bottom><input type=text onfocus="this.select();" class="small" size=30 name="ed_more_title" style="width:100%" value="{$ed_more_title}"></td>
 </tr>
+<tr>
+<td align=right valign=middle><label for="_prikazi_"><b>Show?</b></label></td><td colspan=3 align=left valign=middle><input type="hidden" name="prikazi" value="0"><input type="checkbox" name="ed_prikazi" value="1" id="_prikazi_"{if ($ed_prikazi)} checked{/if}></td></tr>
+</tr>
 <tr><td align=left colspan=4><br><br><b>Topic text:</b>
 <dl><dd>
 {section name=i loop=$ed_text}
@@ -159,6 +167,7 @@
 {if ($i/ed_text.warning == 2)}You uploaded a picture for this paragraph, but have not selected its disposition (the <i>Picture position</i> field).{/if}
 </span><input type=hidden name="ed_text_force_{$i/ed_text.n}" value=1>{else}&nbsp;{/if}</td>
 </tr>
+<tr><td align=right valign=top>Paragraph full picture:</td><td valign=top>{if (! $i/ed_text.fclr)}<img src="{$newspicdir}{$i/ed_text.full}" alt="" border=0{if ($i/ed_text.fw)} width={$i/ed_text.fw}{/if}{if ($i/ed_text.fh)} height={$i/ed_text.fh}{/if}><br>({$i/ed_text.fname})<input type=hidden name="ed_textpic_full2_{$i/ed_text.n}" value="{$i/ed_text.full}"><input type=hidden name="ed_textpic_fname_{$i/ed_text.n}" value="{$i/ed_text.fname}">{else}<i>no picture</i>{/if}</td><td align=right>Filename:</td><td><input type=file onfocus="this.select();" class="small" name="ed_textpic_full_{$i/ed_text.n}" size=10>&nbsp;<input type=submit class="bsmall" name="ed_fclear_{$i/ed_text.n}" value="Delete"{if ($i/ed_text.fclr)} disabled{/if}><input type=hidden name="ed_fclr_{$i/ed_text.n}" value="{$i/ed_text.fclr}"></td></tr>
 </table>
 {if (%i.index% >= %i.loop% - 1)}<hr width="100%" size=2>{/if}
 {sectionelse}
@@ -170,17 +179,13 @@
 {if ($med)}
 <tr><td colspan=4 align=left><b>Specialisations:</b><br>
 <dl><dd>
-{if ($specs)}
 <table border=0 cellspacing=0 cellpadding=0 width="100%">
 <tr><td>
 {section name=i loop=$specs}
-<input type=checkbox name="ed_spec_{$i/specs.id}" value="1" id="_spec_{%i.rownum%}"{if ($i/specs.check)} checked{/if}>&nbsp;<label for="_spec_{%i.rownum%}">{$i/specs.txt}</label><br>
+<input type=hidden name="ed_spec_{$i/specs.id}" value="0"><input type=checkbox name="ed_spec_{$i/specs.id}" value="1" id="_spec_{%i.rownum%}"{if ($i/specs.check)} checked{/if}>&nbsp;<label for="_spec_{%i.rownum%}">{if ($i/specs.id == 0)}<b>{/if}{$i/specs.txt}{if ($i/specs.id == 0)}</b>{/if}</label><br>
 {/section}
 </td></tr>
 </table>
-{else}
-<i>No specialisations.</i>
-{/if}
 </dd></dl>
 </td></tr>
 {else}
@@ -204,14 +209,17 @@
 {if (! $vijest)}
 <tr><td colspan=4 align=left><b>Author:</b><br>
 <table border=0 cellspacing=0 cellpadding=0 width="100%"><tr>
-<td valign=top rowspan=2>
+<td valign=top>
 {if (! $ed_clr_author)}<img src="{$aupicdir}{$ed_author_url}" alt="{$ed_author_alt}" border=0{if ($ed_author_width)} width={$ed_author_width}{/if}{if ($ed_author_height)} height={$ed_author_height}{/if}><br>({$ed_author_name})<input type=hidden name="ed_author_url2" value="{$ed_author_url}"><input type=hidden name="ed_author_name" value="{$ed_author_name}">{else}<i>no picture</i>{/if}<br><br>
 <b>Picture:</b> <input type=file onfocus="this.select();" name="ed_author_url" size=10 class="small">&nbsp;<input type=submit name="ed_clear_author" value="Delete" class="bsmall"{if ($ed_clr_author)} disabled{/if}><input type=hidden name="ed_clr_author" value="{$ed_clr_author}"><br>
 <b>Alt:</b> <input type=text onfocus="this.select();" class="small" size=15 name="ed_author_alt" value="{$ed_author_alt}">
 </td>
 <td align=left valign=top width="50%"><b>Info:</b><br><textarea name="ed_author_info" cols=50 rows=6 wrap=virtual style="width:100%;">{$ed_author_info}</textarea></td>
 </tr>
-<tr><td align=left valign=middle><b>Author's name (for archive):</b> <input type=text onfocus="this.select();" class="small" size=20 name="ed_author_ime" value="{$ed_author_ime}"></td></tr>
+<tr>
+<td align=left valign=middle><b>Author's CV:</b><br><select name="ed_author_cv" class="small"><option value="0"{if (! $ed_author_cv)} selected{/if}>&nbsp;</option>{section name=k loop=$autori}<option value="{$k/autori.id}"{if ($ed_author_cv == $k/autori.id)} selected{/if}>{$k/autori.ime}</option>{/section}</select></td>
+<td align=right valign=middle><b>Author's name (for archive):</b><br><input type=text onfocus="this.select();" class="small" size=20 name="ed_author_ime" value="{$ed_author_ime}"></td>
+</tr>
 </table>
 </td></tr>
 {/if}
@@ -225,4 +233,4 @@
 <input type=hidden name="ed_del_{%i.rownum%}" value="{$i/ed_records.val}">
 {/section}
 <input type=hidden name="ed_order" value="{$ed_order}">
-</form>
+</form><br>