support non-http URLs in labeledURI fields (e.g. xmpp or mailto)

[contagged] / templates / entry_show.tpl

diff --git a/templates/entry_show.tpl b/templates/entry_show.tpl
index 18cc419847da23b7ed9767c9396e884ad9e342cc..4960893f7e413389ef422c68a85acc0e76cddd71 100644 (file)
--- a/templates/entry_show.tpl
+++ b/templates/entry_show.tpl
@@ -39,7 +39,7 @@
               {$entry.state|h}
 {/if}
 {if $entry.country}
-              {$entry.country|h}
+              {$iso3166[$entry.country]}
 {/if}
               <br /><br />
             </td>
@@ -47,7 +47,7 @@
 {if $entry.phone}
           <tr>
             <th>{$lang.phone}:</th>
-            <td>{$entry.phone|h}</td>
+            <td><a href="callto://{$entry.phone|escape:phone}">{$entry.phone|h}</a></td>
           </tr>
 {/if}
 {if $entry.switchboard}
@@ -106,19 +106,19 @@
 {if $entry.homephone}
           <tr>
             <th>{$lang.homephone}:</th>
-            <td>{$entry.homephone|h}</td>
+            <td><a href="callto://{$entry.homephone|escape:phone}">{$entry.homephone|h}</a></td>
           </tr>
 {/if}
 {if $entry.mobile}
           <tr>
             <th>{$lang.mobile}:</th>
-            <td>{$entry.mobile|h}</td>
+            <td><a href="callto://{$entry.mobile|escape:phone}">{$entry.mobile|h}</a></td>
           </tr>
 {/if}
 {if $entry.birthday}
           <tr>
             <th>{$lang.birthday}:</th>
-            <td>{$entry.birthday|h}</td>
+            <td>{$entry.birthday|date_format:$conf.dateformat|h}</td>
           </tr>
 {/if}
 {if $entry.anniversary}
@@ -141,7 +141,11 @@
 {if $entry.url}
           <tr>
             <th>{$lang.url}:</th>
-            <td><a href="{$entry.url|http}" target="_blank">{$entry.url|h}</a></td>
+            <td>
+              {foreach from=$entry.url item=url}
+                {$url|http}<br/>
+              {/foreach}
+            </td>
           </tr>
 {/if}
 {if $entry.mail}
@@ -238,7 +242,6 @@
   </tr>
 </table>
 
-
 </div>
 
 {include file="footer.tpl"}