Merge pull request #15 from cweiske/master

[contagged] / templates / entry_edit.tpl

diff --git a/templates/entry_edit.tpl b/templates/entry_edit.tpl
index 2ea276cbe2294777efdd275be449f748235eb044..9f9fe52b452397d2142937853a4c9973a4a19141 100644 (file)
--- a/templates/entry_edit.tpl
+++ b/templates/entry_edit.tpl
@@ -96,7 +96,9 @@
         <tr>
           <td align="right" valign="top">{$lang.country}:</td>
           <td>
-            <input type="text" class="input ac" name="entry[country]" value="{$entry.country|h}" /><br />
+            <select class="input" name="entry[country]">
+                {html_options options=$iso3166 selected=$entry.country|default:$conf.country|upper}
+            </select>
           </td>
         </tr>
 {/if}
@@ -214,13 +216,20 @@
         <tr>
           <td colspan="2"><h3>{$lang.communication}</h3></td>
         </tr>
-{if $fields.url}
+{if $fields._url}
+        {foreach from=$entry.url|smarty:nodefaults item=url}
+        <tr>
+          <th>{$lang.url} {counter}:</th>
+          <td><input type="text" class="input" name="entry[url][]" value="{$url|h}" /></td>
+        </tr>
+        {/foreach}
         <tr>
-          <th>{$lang.url}:</th>
-          <td><input type="text" class="input" name="entry[url]" value="{$entry.url|h}" /></td>
+          <th>{$lang.url} {counter}:</th>
+          <td><input type="text" class="input" name="entry[url][]" value="" /></td>
         </tr>
 {/if}
 {if $fields._mail}
+        <!--{counter start=0}-->
         {foreach from=$entry.mail|smarty:nodefaults item=mail}
         <tr>
           <th>{$lang.mail} {counter}:</th>
@@ -310,7 +319,7 @@
     </td>
   </tr>
 
-  {if $entry.dn == ''}
+  {if $entry.dn == '' && $conf.privatebook}
   <tr>
     <td colspan="2" align="center">
       {$lang.msg_addto}<br />
@@ -322,6 +331,8 @@
       </td></tr></table>
     </td>
   </tr>
+  {else}
+      <input type="hidden" name="type" value="public" id="typepublic"/>
   {/if}
 
   <tr>