--- templates/edit.tpl	2001/08/03 09:12:42	1.1
+++ templates/edit.tpl	2001/09/03 15:52:16	1.5
@@ -8,7 +8,7 @@
 	alert(t + ": not yet implemented.");
 	src.blur();
 	if (!obj) return;
-	var o = eval('document.forms[0].elements["'+obj+'"]');
+	var o = eval("document.forms[0].elements['"+obj+"']");
 	if (!o) return;
 	o.focus();
 	// ...
@@ -22,7 +22,7 @@
 
 <form action="{$FORM_ACTION}" method=post enctype="multipart/form-data">
 {if ($ed_preview)}
-<table border=1 cellspacing=0 cellpadding=5 width="100%"><tr><td>
+<table border=1 cellspacing=0 cellpadding=6 width="100%"><tr><td>
 {if (! $ed_clr_main && $ed_titlepic_url && ($ed_titlepic_pos == 1 || $ed_titlepic_pos == 2 || $ed_titlepic_pos == 3))}
   <p align={if ($ed_titlepic_pos == 1)}left{/if}{if ($ed_titlepic_pos == 2)}center{/if}{if ($ed_titlepic_pos == 3)}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}
@@ -46,6 +46,7 @@
 <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_more" value="{$ed_more}">
+<input type=hidden name="ed_more_title" value="{$ed_more_title}">
 <input type=hidden name="ed_clr_main" value="{$ed_clr_main}">
 {if ($ed_trigger)}<input type=hidden name="{$ed_trigger}" value="1">{/if}
 {section name=i loop=$ed_text}
@@ -73,20 +74,20 @@
 <input type=hidden name="ed_textpic_pos_{$i/ed_text.n}" value="{$i/ed_text.pos}">
 <input type=hidden name="ed_clr_{$i/ed_text.n}" value="{$i/ed_text.clr}">
 {/section}
-{if ($ed_more)}<p align=right><small>[ <a href="{$ed_more}" class="more">more info</a> ]</small></p>{/if}
+{if ($ed_more)}<p align=right><small>[ <a href="{$ed_more}" class="more">{if ($ed_more_title)}{$ed_more_title}{else}više...{/if}</a> ]</small></p>{/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>
 {else}
 <table border=1 cellspacing=0 cellpadding=2 width="100%" bgcolor="#E0E0E0">
-{if ($ed_empties)}<tr bgcolor="#C0C0FF"><td style="padding:10px"><tt><b>You have some empty paragraphs. For more information, review the notes marked <font color="#FF0000">red</font> below.<br><br>Click &quot;<i>Preview</i>&quot; below again to preview the article anyway.</b></tt></td></tr>{/if}
+{if ($ed_warnings)}<tr bgcolor="#C0C0FF"><td style="padding:10px"><span class="note">Some warnings were generated while processing your article. For more information, review the notes marked <span class="warning">red</span> below.<br><br>Click &quot;<i>Preview</i>&quot; below again to ignore warnings and preview the article anyway.</span></td></tr>{/if}
 <tr><td>
 <table border=0 cellspacing=0 cellpadding=3 width="100%">
 <tr><td align=right><b>Title:</b></td><td colspan=3><input type=text onfocus="select();" class="small" size=30 name="ed_title" value="{$ed_title}" style="width:100%"></td></tr>
 <tr><td align=right valign=top><b>Lead:</b></td><td colspan=3><textarea name="ed_lead" onfocus="select();" class="small" style="width:100%" cols=35 rows=3 wrap=virtual>{$ed_lead}</textarea></td></tr>
 <tr><td align=right valign=middle><b>Category:</b></td><td colspan=3><select name="ed_cat" class="small" style="width:100%">{section name=i loop=$categories}<option value="{$i/categories.id}"{if ($ed_cat == $i/categories.id)} selected{/if}>{$i/categories.txt}</option>{/section}</select></td></tr>
 <tr><td align=right valign=top rowspan=2><b>Title picture:</b></td><td rowspan=2 valign=top>{if (! $ed_clr_main)}<img src="{$newspicdir}{$ed_titlepic_url}" alt="{$ed_titlepic_alt}" border=0{if ($ed_titlepic_width)} width={$ed_titlepic_width}{/if}{if ($ed_titlepic_height)} height={$ed_titlepic_height}{/if}><br>({$ed_titlepic_name})<input type=hidden name="ed_titlepic_url2" value="{$ed_titlepic_url}"><input type=hidden name="ed_titlepic_name" value="{$ed_titlepic_name}">{else}<i>no picture</i>{/if}</td><td align=right width="25%"><b>Filename:</b></td><td><input type=file onfocus="select();" name="ed_titlepic_url" size=10 class="small">&nbsp;<input type=submit name="ed_clear_main" value="Delete" class="small"{if ($ed_clr_main)} disabled{/if}><input type=hidden name="ed_clr_main" value="{$ed_clr_main}"></td></tr><tr><td align=right><b>Alt:</b></td><td><input type=text onfocus="select();" class="small" size=15 name=ed_titlepic_alt value="{$ed_titlepic_alt}"></td></tr>
-<tr><td align=right valign=top><b>Title picture position:</b></td><td colspan=3>
+<tr><td align=right valign=top><b>Title picture position:</b></td><td>
 <table border=0 cellspacing=0 cellpadding=0>
 <tr>
 <td><input type=radio class="small" name="ed_titlepic_pos" value=1 title="Upper left"{if ($ed_titlepic_pos == 1)} checked{/if}></td>
@@ -104,8 +105,15 @@
 <td><input type=radio class="small" name="ed_titlepic_pos" value=8 title="Lower right"{if ($ed_titlepic_pos == 8)} checked{/if}></td>
 </tr>
 </table></td>
+<td colspan=2 align=right valign=bottom>{if ($ed_warning)}<span class="warning"><i>WARNING:</i>
+{if ($ed_warning == 2)}You uploaded a title picture, but have not selected its disposition (the <i>Title picture position</i> field).{/if}
+</span><input type=hidden name="ed_title_force" value=1>{else}&nbsp;{/if}</td>
+</tr>
+<td align=right valign=bottom><b>URL for more info:</b></td><td colspan=3 align=left valign=bottom><input type=text onfocus="select();" class="small" size=30 name="ed_more" style="width:100%" value="{$ed_more}"></td>
+</tr>
+<tr>
+<td align=right valign=bottom><b>URL title:</b></td><td colspan=3 align=left valign=bottom><input type=text onfocus="select();" class="small" size=30 name="ed_more_title" style="width:100%" value="{$ed_more_title}"></td>
 </tr>
-<td align=right><b>URL for more info:</b></td><td colspan=3 align=left><input type=text onfocus="select();" class="small" size=30 name="ed_more" style="width:100%" value="{$ed_more}"></td>
 <tr><td align=left colspan=4><br><br><b>Topic text:</b>
 <dl><dd>
 {section name=i loop=$ed_text}
@@ -132,7 +140,10 @@
 <td><input type=radio class="small" name="ed_textpic_pos_{$i/ed_text.n}" value=8 title="Lower right"{if ($i/ed_text.pos == 8)} checked{/if}></td>
 </tr>
 </table></td>
-<td colspan=2 align=right valign=bottom>{if ($i/ed_text.empty)}<font color="#FF0000"><tt><b><i>WARNING:</i> this paragraph has neither text nor picture.</b></tt></font><input type=hidden name="ed_text_force_{$i/ed_text.n}" value=1>{else}&nbsp;{/if}</td>
+<td colspan=2 align=right valign=bottom>{if ($i/ed_text.warning)}<span class="warning"><i>WARNING:</i>
+{if ($i/ed_text.warning == 1)}This paragraph is empty (ie. it has neither text nor picture).{/if}
+{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>
 </table>
 {if (%i.index% >= %i.loop% - 1)}<hr width="100%" size=2>{/if}
@@ -151,4 +162,5 @@
 <input type=hidden name="ed_text_id_{%i.rownum%}" value="{$i/ed_records.id}">
 <input type=hidden name="ed_del_{%i.rownum%}" value="{$i/ed_records.val}">
 {/section}
+<input type=hidden name="ed_order" value="{$ed_order}">
 </form>