From eca22bdda865d38300248e20f47870cacdf4df96 Mon Sep 17 00:00:00 2001
From: Edward Mann <phpeclipse.dev@edmann.com>
Date: Fri, 1 Feb 2008 04:59:17 +0000
Subject: [PATCH] Templates were updated by pteague. Also a little change by ed_mann.

---
 .../templates/default-templates.xml                |  417 ++++++++------------
 .../templates/default-templates.xml                |   80 +++--
 2 files changed, 219 insertions(+), 278 deletions(-)

diff --git a/net.sourceforge.phpeclipse.ui/templates/default-templates.xml b/net.sourceforge.phpeclipse.ui/templates/default-templates.xml
index 1e8b109..aac90e5 100644
--- a/net.sourceforge.phpeclipse.ui/templates/default-templates.xml
+++ b/net.sourceforge.phpeclipse.ui/templates/default-templates.xml
@@ -1,244 +1,164 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates>
-<template name="for" description="for array" id="net.sourceforge.phpdt.html.for_array" context="javascript" enabled="true">for (var ${index} = 0; ${index} &lt; ${array}.length; ${index}++) {
+<template name="for" description="for array" id="net.sourceforge.phpdt.html.for_array" context="javascript" enabled="true">for (var ${index} = 0, ${index2} = ${array}.length; ${index} &lt; ${index2}; ${index}++) {
 	${line_selection}${cursor}
 }</template>
   <template name="xml" description="html page with head,title,body" 
-  id="net.sourceforge.phpdt.xml.templates.xml" context="xml" enabled="true">
-&lt;?xml ?&gt;</template> 
+  id="net.sourceforge.phpdt.xml.templates.xml" context="xml" enabled="true">&lt;?xml ?&gt;</template>
 
   <template name="&lt;html" description="html page with head,title,body" 
-  id="net.sourceforge.phpdt.html.html" context="html" enabled="true">
+  id="net.sourceforge.phpdt.html.html" context="html" enabled="true">&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+	"http://www.w3.org/TR/html4/loose.dtd"&gt;
 &lt;html&gt;
 &lt;head&gt;
-&lt;meta http-equiv="Content-Language" content="en" /&gt;
-&lt;meta name="GENERATOR" content="PHPEclipse 1.0" /&gt;
-&lt;meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /&gt;
-&lt;title&gt;${title}&lt;/title&gt;
+	&lt;meta http-equiv="Content-Type" content="text/html; charset=utf-8" /&gt;
+	&lt;meta http-equiv="Content-Language" content="en" /&gt;
+	&lt;meta name="GENERATOR" content="PHPEclipse 1.2.0" /&gt;
+	&lt;title&gt;${title}&lt;/title&gt;
 &lt;/head&gt;
-&lt;body bgcolor="#FFFFFF" text="#000000" link="#FF9966" vlink="#FF9966" alink="#FFCC99"&gt;
+&lt;body&gt;
 ${cursor}
 &lt;/body&gt;
-&lt;/html&gt;
-  </template>  
+&lt;/html&gt;</template>  
   <template name="&lt;html" description="xhtml page with doctype, head, title and body" 
-  id="net.sourceforge.phpdt.html.xhtml" context="html" enabled="true">
-&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Transitional//EN&quot;
-  &quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd&quot;&gt;
-
-&lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot; xml:lang=&quot;en&quot;&gt;
-
+  id="net.sourceforge.phpdt.html.xhtml" context="html" enabled="true">&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Transitional//EN&quot;
+	&quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd&quot;&gt;
+&lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot; lang=&quot;en_US&quot; xml:lang=&quot;en_US&quot;&gt;
 &lt;head&gt;
-  &lt;meta http-equiv=&quot;Content-Language&quot; content=&quot;en&quot; /&gt;
-  &lt;meta name=&quot;GENERATOR&quot; content=&quot;PHPeclipse 1.9&quot; /&gt;
-  &lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=iso-8859-1&quot; /&gt;
-  &lt;title&gt;${title}&lt;/title&gt;
+	&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=utf-8&quot; /&gt;
+	&lt;meta http-equiv=&quot;Content-Language&quot; content=&quot;en&quot; /&gt;
+	&lt;meta name=&quot;GENERATOR&quot; content=&quot;PHPEclipse 1.2.0&quot; /&gt;
+	&lt;title&gt;${title}&lt;/title&gt;
 &lt;/head&gt;
-
 &lt;body&gt;
 ${cursor}
 &lt;/body&gt;
-&lt;/html&gt;
-  </template>  
-  <template name="&lt;title" description="title" id="net.sourceforge.phpdt.html.title" context="html" enabled="true">
-  &lt;title&gt;${cursor}&lt;/title&gt;
-  </template> 
+&lt;/html&gt;</template>
+  <template name="&lt;title" description="title" id="net.sourceforge.phpdt.html.title" context="html" enabled="true">&lt;title&gt;${cursor}&lt;/title&gt;</template> 
   
-  <template name="&lt;table" description="3x3 table" id="net.sourceforge.phpdt.html.table" context="html" enabled="true">
-  &lt;table&gt;
-    &lt;tr&gt;
-      &lt;td&gt;${t00}&lt;/td&gt;&lt;td&gt;${t01}&lt;/td&gt;&lt;td&gt;${t02}&lt;/td&gt;
-    &lt;/tr&gt;
-    &lt;tr&gt;
-      &lt;td&gt;${t10}&lt;/td&gt;&lt;td&gt;${t11}&lt;/td&gt;&lt;td&gt;${t12}&lt;/td&gt;
-    &lt;/tr&gt;
-    &lt;tr&gt;
-      &lt;td&gt;${t20}&lt;/td&gt;&lt;td&gt;${t21}&lt;/td&gt;&lt;td&gt;${t22}&lt;/td&gt;
-    &lt;/tr&gt;    
-  &lt;/table&gt;
-  ${cursor}
-  </template>
-  <template name="&lt;table" description="3x3 table with header" id="net.sourceforge.phpdt.html.table_header" context="html" enabled="true">
-  &lt;table&gt;
-    &lt;tr&gt;
-      &lt;th&gt;${header0}&lt;/th&gt;&lt;th&gt;${header1}&lt;/th&gt;&lt;th&gt;${header2}&lt;/th&gt;
-    &lt;/tr&gt;
-    &lt;tr&gt;
-      &lt;td&gt;${t00}&lt;/td&gt;&lt;td&gt;${t01}&lt;/td&gt;&lt;td&gt;${t02}&lt;/td&gt;
-    &lt;/tr&gt;
-    &lt;tr&gt;
-      &lt;td&gt;${t10}&lt;/td&gt;&lt;td&gt;${t11}&lt;/td&gt;&lt;td&gt;${t12}&lt;/td&gt;
-    &lt;/tr&gt;
-    &lt;tr&gt;
-      &lt;td&gt;${t20}&lt;/td&gt;&lt;td&gt;${t21}&lt;/td&gt;&lt;td&gt;${t22}&lt;/td&gt;
-    &lt;/tr&gt;    
-  &lt;/table&gt;
-  ${cursor}
-  </template>
+  <template name="&lt;table" description="3x3 table" id="net.sourceforge.phpdt.html.table" context="html" enabled="true">&lt;table&gt;
+	&lt;tr&gt;
+		&lt;td&gt;${t00}&lt;/td&gt;
+		&lt;td&gt;${t01}&lt;/td&gt;
+		&lt;td&gt;${t02}&lt;/td&gt;
+	&lt;/tr&gt;
+	&lt;tr&gt;
+		&lt;td&gt;${t10}&lt;/td&gt;
+		&lt;td&gt;${t11}&lt;/td&gt;
+		&lt;td&gt;${t12}&lt;/td&gt;
+	&lt;/tr&gt;
+	&lt;tr&gt;
+		&lt;td&gt;${t20}&lt;/td&gt;
+		&lt;td&gt;${t21}&lt;/td&gt;
+		&lt;td&gt;${t22}&lt;/td&gt;
+	&lt;/tr&gt;
+&lt;/table&gt;
+${cursor}</template>
+  <template name="&lt;table" description="3x3 table with header" id="net.sourceforge.phpdt.html.table_header" context="html" enabled="true">&lt;table&gt;
+	&lt;tr&gt;
+		&lt;th&gt;${header0}&lt;/th&gt;
+		&lt;th&gt;${header1}&lt;/th&gt;
+		&lt;th&gt;${header2}&lt;/th&gt;
+	&lt;/tr&gt;
+	&lt;tr&gt;
+		&lt;td&gt;${t00}&lt;/td&gt;
+		&lt;td&gt;${t01}&lt;/td&gt;
+		&lt;td&gt;${t02}&lt;/td&gt;
+	&lt;/tr&gt;
+	&lt;tr&gt;
+		&lt;td&gt;${t10}&lt;/td&gt;
+		&lt;td&gt;${t11}&lt;/td&gt;
+		&lt;td&gt;${t12}&lt;/td&gt;
+	&lt;/tr&gt;
+	&lt;tr&gt;
+		&lt;td&gt;${t20}&lt;/td&gt;
+		&lt;td&gt;${t21}&lt;/td&gt;
+		&lt;td&gt;${t22}&lt;/td&gt;
+	&lt;/tr&gt;
+&lt;/table&gt;
+${cursor}</template>
   
-  <template name="&lt;a" description="hyperlink (href)" id="net.sourceforge.phpdt.html.a" context="html" enabled="true">
-  &lt;a href="${link}"&gt;${description}&lt;/a&gt; ${cursor}
-  </template>  
-  <template name="&lt;a" description="hyperlink image" id="net.sourceforge.phpdt.html.a_image" context="html" enabled="true">
-  &lt;a href="${link}"&gt;&lt;img src="${image}"&gt;&lt;/a&gt; ${cursor}
-  </template> 
-  <template name="&lt;a" description="hyperlink fragment identifier (name)" id="net.sourceforge.phpdt.html.a_anchor" context="html" enabled="true">
-  &lt;a name="${anchor}"&gt;${description}&lt;/a&gt; ${cursor}
-  </template> 
-  <template name="&lt;p" description="paragraph" id="net.sourceforge.phpdt.html.p" context="html" enabled="true">
-  &lt;p&gt;${cursor}&lt;/p&gt;
-  </template>
-  <template name="&lt;h1" description="heading 1" id="net.sourceforge.phpdt.html.h1" context="html" enabled="true">
-  &lt;h1&gt;${cursor}&lt;/h1&gt;
-  </template>
-  <template name="&lt;h2" description="heading 2" id="net.sourceforge.phpdt.html.h2" context="html" enabled="true">
-  &lt;h2&gt;${cursor}&lt;/h2&gt;
-  </template>
-  <template name="&lt;h3" description="heading 3" id="net.sourceforge.phpdt.html.h3" context="html" enabled="true">
-  &lt;h3&gt;${cursor}&lt;/h3&gt;
-  </template>
-  <template name="&lt;h4" description="heading 4" id="net.sourceforge.phpdt.html.h4" context="html" enabled="true">
-  &lt;h4&gt;${cursor}&lt;/h4&gt;
-  </template>
-  <template name="&lt;h5" description="heading 5" id="net.sourceforge.phpdt.html.h5" context="html" enabled="true">
-  &lt;h5&gt;${cursor}&lt;/h5&gt;
-  </template>
-  <template name="&lt;h6" description="heading 6" id="net.sourceforge.phpdt.html.h6" context="html" enabled="true">
-  &lt;h6&gt;${cursor}&lt;/h6&gt;
-  </template>
-  <template name="&lt;address" description="address" id="net.sourceforge.phpdt.html.address" context="html" enabled="true">
-  &lt;address&gt;${cursor}&lt;/address&gt;
-  </template>
-  <template name="&lt;pre" description="preformat" id="net.sourceforge.phpdt.html.pre" context="html" enabled="true">
-  &lt;pre&gt;${cursor}&lt;/pre&gt;
-  </template>
-  <template name="&lt;code" description="code block" id="net.sourceforge.phpdt.html.code" context="html" enabled="true">
-  &lt;code&gt;${cursor}&lt;/code&gt;
-  </template>
-  <template name="&lt;blockquote" description="blockquote" id="net.sourceforge.phpdt.html.blockquote" context="html" enabled="true">
-  &lt;blockquote&gt;${cursor}&lt;br /&gt;
-  &lt;/blockquote&gt;
-  </template>
-  <template name="&lt;hr" description="horizontal line" id="net.sourceforge.phpdt.html.hr" context="html" enabled="true">
-  &lt;hr width="100%" size="2" /&gt;
-  ${cursor}
-  </template>
-  <template name="&lt;ul" description="bulleted list" id="net.sourceforge.phpdt.html.ul" context="html" enabled="true">
-  &lt;ul&gt;
-    &lt;li&gt;${item1}&lt;br /&gt;
-    &lt;/li&gt;
-    &lt;li&gt;${item2}&lt;br /&gt;
-    &lt;/li&gt;
-  &lt;/ul&gt;
-  </template>
-  <template name="&lt;ol" description="numbered list" id="net.sourceforge.phpdt.html.ol" context="html" enabled="true">
-  &lt;ol&gt;
-    &lt;li&gt;${item1}&lt;br /&gt;
-    &lt;/li&gt;
-    &lt;li&gt;${item2}&lt;br /&gt;
-    &lt;/li&gt;
-  &lt;/ol&gt;
-  </template>
-  <template name="&lt;dl" description="term list" id="net.sourceforge.phpdt.html.dl_term" context="html" enabled="true">
-  &lt;dl&gt;
-    &lt;dt&gt;${item1}&lt;br /&gt;
-    &lt;/dt&gt;
-    &lt;dt&gt;${item2}&lt;br /&gt;
-    &lt;/dt&gt;
-  &lt;/dl&gt;
-  </template>
-  <template name="&lt;dl" description="definition list" id="net.sourceforge.phpdt.html.dl_list" context="html" enabled="true">
-  &lt;dl&gt;
-    &lt;dd&gt;${item1}&lt;br /&gt;
-    &lt;/dd&gt;
-    &lt;dd&gt;${item2}&lt;br /&gt;
-    &lt;/dd&gt;
-  &lt;/dl&gt;
-  </template>
-  <template name="&lt;form" description="form get" id="net.sourceforge.phpdt.html.form_get" context="html" enabled="true">
-  &lt;form action="${link}" method="${get}"&gt;
-  ${cursor}
-  &lt;/form&gt;
-  </template>
-  <template name="&lt;form" description="form post" id="net.sourceforge.phpdt.html.form_post" context="html" enabled="true">
-  &lt;form action="${link}" method="${post}" enctype="text/plain"&gt;
-  ${cursor}
-  &lt;/form&gt;
-  </template>
-  <template name="&lt;form" description="form upload file" id="net.sourceforge.phpdt.html.form_upload" context="html" enabled="true">
-  &lt;form action="${link}" method="${post}" enctype="multipart/form-data"&gt;
-  &lt;p&gt;${text}&lt;/p&gt;
-  &lt;input type="file" name="${name}" size="50" maxlength="100000" accept="text/*" /&gt;&lt;br /&gt;
-  &lt;input type="submit" value="${value}" /&gt;
-  ${cursor}
-  &lt;/form&gt;
-  </template>
-  <template name="&lt;input" description="input type=text (form)" id="net.sourceforge.phpdt.html.form_input_text" context="html" enabled="true">
-  &lt;input type="text" name="${name}" value="${value}" size="40" maxlength="40" /&gt;
-  ${cursor}
-  </template>
-  <template name="&lt;input" description="input type=password (form)" id="net.sourceforge.phpdt.html.form_input_password" context="html" enabled="true">
-  &lt;input type="password" name="${name}" size="40" maxlength="40" /&gt;
-  ${cursor}
-  </template>  
-  <template name="&lt;input" description="input type=radio (form)" id="net.sourceforge.phpdt.html.form_input_radio" context="html" enabled="true">
-  &lt;input type="radio" name="${name}" value="${value}" /&gt;
-  ${cursor}
-  </template>
-  <template name="&lt;input" description="input type=checkbox (form)" id="net.sourceforge.phpdt.html.form_input_checkbox" context="html" enabled="true">
-  &lt;input type="checkbox" name="${name}" value="${value}" /&gt;
-  ${cursor}
-  </template>
-  <template name="&lt;input" description="input type=button (form button)" id="net.sourceforge.phpdt.html.form_input_button" context="html" enabled="true">
-  &lt;input type="button" name="${name}" value="${value}" /&gt;
-  ${cursor}
-  </template>
-  <template name="&lt;input" description="input type=submit (form button)" id="net.sourceforge.phpdt.html.form_input_submit" context="html" enabled="true">
-  &lt;input type="submit" name="${name}" value="${value}" /&gt;
-  ${cursor}
-  </template>
-  <template name="&lt;input" description="input type=reset (form button)" id="net.sourceforge.phpdt.html.form_input_reset" context="html" enabled="true">
-  &lt;input type="reset" name="${name}" value="${value}" /&gt;
-  ${cursor}
-  </template>
-  <template name="&lt;textarea" description="textarea (form)" id="net.sourceforge.phpdt.html.form_input_textarea" context="html" enabled="true">
-  &lt;textarea name="${name}" rows="10" cols="50" wrap="off"&gt;
-  ${text}
-  &lt;/textarea&gt;
-  ${cursor}
-  </template>
-  <template name="&lt;select" description="select option (form)" id="net.sourceforge.phpdt.html.form_input_select" context="html" enabled="true">
-  &lt;select name="${name}" size="3"&gt;
-    &lt;option value="${value1}"&gt;${option1}&lt;/option&gt;
-    &lt;option value="${value2}"&gt;${option2}&lt;/option&gt;
-    &lt;option value="${value3}"&gt;${option3}&lt;/option&gt;
-  &lt;/select&gt;
-  </template>
-  <template name="&lt;xml" description="xml version=1.0" id="net.sourceforge.phpdt.html.xml" context="html" enabled="true">
-  &lt;?xml version="1.0"?&gt;
-  ${cursor}
-  </template>
-  <template name="&lt;xml" description="xml-stylesheet type=text/xsl" id="net.sourceforge.phpdt.html.xml_stylesheet" context="html" enabled="true">
-  &lt;?xml-stylesheet type="text/xsl" href="${url}"&gt;
-  ${cursor}
-  </template>
-  <template name="&lt;script" description="JavaScript inline" id="net.sourceforge.phpdt.html.javascript_inline" context="html" enabled="true">&lt;script language="JavaScript" type="text/javascript"&gt;
-  ${cursor}
-&lt;/script&gt;
-  </template>
-  <template name="&lt;script" description="JavaScript file" id="net.sourceforge.phpdt.html.javascript_file" context="html" enabled="true">&lt;script language="JavaScript" type="text/javascript" src="${jsfile}.js"&gt;&lt;/script&gt;${cursor}
-  </template>
+  <template name="&lt;a" description="hyperlink (href)" id="net.sourceforge.phpdt.html.a" context="html" enabled="true">&lt;a href="${link}"&gt;${description}&lt;/a&gt;${cursor}</template>  
+  <template name="&lt;a" description="hyperlink image" id="net.sourceforge.phpdt.html.a_image" context="html" enabled="true">&lt;a href="${link}"&gt;&lt;img src="${image}" alt="${alt}" /&gt;&lt;/a&gt;${cursor}</template> 
+  <template name="&lt;p" description="paragraph" id="net.sourceforge.phpdt.html.p" context="html" enabled="true">&lt;p&gt;${cursor}&lt;/p&gt;</template>
+  <template name="&lt;h1" description="heading 1" id="net.sourceforge.phpdt.html.h1" context="html" enabled="true">&lt;h1&gt;${cursor}&lt;/h1&gt;</template>
+  <template name="&lt;h2" description="heading 2" id="net.sourceforge.phpdt.html.h2" context="html" enabled="true">&lt;h2&gt;${cursor}&lt;/h2&gt;</template>
+  <template name="&lt;h3" description="heading 3" id="net.sourceforge.phpdt.html.h3" context="html" enabled="true">&lt;h3&gt;${cursor}&lt;/h3&gt;</template>
+  <template name="&lt;h4" description="heading 4" id="net.sourceforge.phpdt.html.h4" context="html" enabled="true">&lt;h4&gt;${cursor}&lt;/h4&gt;</template>
+  <template name="&lt;h5" description="heading 5" id="net.sourceforge.phpdt.html.h5" context="html" enabled="true">&lt;h5&gt;${cursor}&lt;/h5&gt;</template>
+  <template name="&lt;h6" description="heading 6" id="net.sourceforge.phpdt.html.h6" context="html" enabled="true">&lt;h6&gt;${cursor}&lt;/h6&gt;</template>
+  <template name="&lt;address" description="address" id="net.sourceforge.phpdt.html.address" context="html" enabled="true">&lt;address&gt;${cursor}&lt;/address&gt;</template>
+  <template name="&lt;pre" description="preformat" id="net.sourceforge.phpdt.html.pre" context="html" enabled="true">&lt;pre&gt;${cursor}&lt;/pre&gt;</template>
+  <template name="&lt;code" description="code block" id="net.sourceforge.phpdt.html.code" context="html" enabled="true">&lt;code&gt;${cursor}&lt;/code&gt;</template>
+  <template name="&lt;blockquote" description="blockquote" id="net.sourceforge.phpdt.html.blockquote" context="html" enabled="true">&lt;blockquote&gt;
+	&lt;p&gt;${cursor}&lt;/p&gt;
+&lt;/blockquote&gt;</template>
+  <template name="&lt;hr" description="horizontal line" id="net.sourceforge.phpdt.html.hr" context="html" enabled="true">&lt;hr /&gt;${cursor}</template>
+  <template name="&lt;ul" description="bulleted list" id="net.sourceforge.phpdt.html.ul" context="html" enabled="true">&lt;ul&gt;
+	&lt;li&gt;${item1}&lt;/li&gt;
+	&lt;li&gt;${item2}&lt;/li&gt;
+&lt;/ul&gt;</template>
+  <template name="&lt;ol" description="numbered list" id="net.sourceforge.phpdt.html.ol" context="html" enabled="true">&lt;ol&gt;
+	&lt;li&gt;${item1}&lt;/li&gt;
+	&lt;li&gt;${item2}&lt;/li&gt;
+&lt;/ol&gt;</template>
+  <template name="&lt;dl" description="term list" id="net.sourceforge.phpdt.html.dl_term" context="html" enabled="true">&lt;dl&gt;
+	&lt;dt&gt;${item1}&lt;/dt&gt;
+	&lt;dt&gt;${item2}&lt;/dt&gt;
+&lt;/dl&gt;</template>
+  <template name="&lt;dl" description="definition list" id="net.sourceforge.phpdt.html.dl_list" context="html" enabled="true">&lt;dl&gt;
+	&lt;dd&gt;${item1}&lt;/dd&gt;
+	&lt;dd&gt;${item2}&lt;/dd&gt;
+&lt;/dl&gt;</template>
+  <template name="&lt;form" description="form get" id="net.sourceforge.phpdt.html.form_get" context="html" enabled="true">&lt;form action="${link}" method="get"&gt;
+${cursor}
+&lt;/form&gt;</template>
+  <template name="&lt;form" description="form post" id="net.sourceforge.phpdt.html.form_post" context="html" enabled="true">&lt;form action="${link}" method="post" enctype="text/plain"&gt;
+${cursor}
+&lt;/form&gt;</template>
+  <template name="&lt;form" description="form upload file" id="net.sourceforge.phpdt.html.form_upload" context="html" enabled="true">&lt;form action="${link}" method="post" enctype="multipart/form-data"&gt;
+&lt;label for="${name}"&gt;${text}&lt;/label&gt;
+&lt;input type="file" id="${name}" name="${name}" size="50" maxlength="100000" accept="text/*" /&gt;
+${cursor}
+&lt;input type="submit" value="${value}" /&gt;
+&lt;/form&gt;</template>
+  <template name="&lt;input" description="input type=text (form)" id="net.sourceforge.phpdt.html.form_input_text" context="html" enabled="true">&lt;input type="text" class="text" name="${name}" value="${value}" size="40" maxlength="40" /&gt;
+${cursor}</template>
+  <template name="&lt;input" description="input type=password (form)" id="net.sourceforge.phpdt.html.form_input_password" context="html" enabled="true">&lt;input type="password" class="password" name="${name}" size="40" maxlength="40" /&gt;
+${cursor}</template>
+  <template name="&lt;input" description="input type=radio (form)" id="net.sourceforge.phpdt.html.form_input_radio" context="html" enabled="true">&lt;input type="radio" class="radio" name="${name}" value="${value}" /&gt;
+${cursor}</template>
+  <template name="&lt;input" description="input type=checkbox (form)" id="net.sourceforge.phpdt.html.form_input_checkbox" context="html" enabled="true">&lt;input type="checkbox" class="checkbox" name="${name}" value="${value}" /&gt;
+${cursor}</template>
+  <template name="&lt;input" description="input type=button (form button)" id="net.sourceforge.phpdt.html.form_input_button" context="html" enabled="true">&lt;input type="button" class="button" name="${name}" value="${value}" /&gt;
+${cursor}</template>
+  <template name="&lt;input" description="input type=submit (form button)" id="net.sourceforge.phpdt.html.form_input_submit" context="html" enabled="true">&lt;input type="submit" class="submit" name="${name}" value="${value}" /&gt;
+${cursor}</template>
+  <template name="&lt;input" description="input type=reset (form button)" id="net.sourceforge.phpdt.html.form_input_reset" context="html" enabled="true">&lt;input type="reset" class="reset" name="${name}" value="${value}" /&gt;
+${cursor}</template>
+  <template name="&lt;textarea" description="textarea (form)" id="net.sourceforge.phpdt.html.form_input_textarea" context="html" enabled="true">&lt;textarea name="${name}" rows="10" cols="50" wrap="off"&gt;${text}&lt;/textarea&gt;
+${cursor}</template>
+  <template name="&lt;select" description="select option (form)" id="net.sourceforge.phpdt.html.form_input_select" context="html" enabled="true">&lt;select name="${name}" size="3"&gt;
+	&lt;option value="${value1}"&gt;${option1}&lt;/option&gt;
+	&lt;option value="${value2}"&gt;${option2}&lt;/option&gt;
+	&lt;option value="${value3}"&gt;${option3}&lt;/option&gt;
+&lt;/select&gt;</template>
+  <template name="&lt;xml" description="xml version=1.0" id="net.sourceforge.phpdt.html.xml" context="html" enabled="true">&lt;?xml version="1.0"?&gt;
+${cursor}</template>
+  <template name="&lt;xml" description="xml-stylesheet type=text/xsl" id="net.sourceforge.phpdt.html.xml_stylesheet" context="html" enabled="true">&lt;?xml-stylesheet type="text/xsl" href="${url}"?&gt;
+${cursor}</template>
+  <template name="&lt;script" description="JavaScript inline" id="net.sourceforge.phpdt.html.javascript_inline" context="html" enabled="true">&lt;script type="text/javascript"&gt;
+${cursor}
+&lt;/script&gt;</template>
+  <template name="&lt;script" description="JavaScript file" id="net.sourceforge.phpdt.html.javascript_file" context="html" enabled="true">&lt;script type="text/javascript" src="${jsfile}.js"&gt;&lt;/script&gt;${cursor}</template>
   <template name="&lt;style" description="style text/css" id="net.sourceforge.phpdt.html.css" context="html" enabled="true">&lt;style type="text/css"&gt;
-<!--
-  ${cursor}
--->
-&lt;/style&gt;
-  </template>
+${cursor}
+&lt;/style&gt;</template>
   <template name="&amp;quot" description="quot" id="net.sourceforge.phpdt.html.quot" context="html" enabled="true">&amp;quot;</template>
   <template name="&amp;amp" description="ampersand" id="net.sourceforge.phpdt.html.ampersand" context="html" enabled="true">&amp;amp;</template>
   <template name="&amp;lt" description="less than" id="net.sourceforge.phpdt.html.less_than" context="html" enabled="true">&amp;lt;</template>
   <template name="&amp;gt" description="greater than" id="net.sourceforge.phpdt.html.greater" context="html" enabled="true">&amp;gt;</template>
-  
+
   <template name="&amp;nbsp" description="no-break space" id="net.sourceforge.phpdt.html." context="html" enabled="true">&amp;nbsp;</template>
   <template name="&amp;iexcl" description="iexcl" id="net.sourceforge.phpdt.html." context="html" enabled="true">&amp;iexcl;</template>
   <template name="&amp;cent" description="cent" id="net.sourceforge.phpdt.html." context="html" enabled="true">&amp;cent;</template>
@@ -339,51 +259,51 @@ ${cursor}
   <template name="&amp;thorn" description="thorn" id="net.sourceforge.phpdt.html." context="html" enabled="true">&amp;thorn;</template>
   <template name="&amp;yuml" description="yuml" id="net.sourceforge.phpdt.html." context="html" enabled="true">&amp;yuml;</template>
 
-  <template name="#00FFFF" description="Aqua (Color Code)" id="net.sourceforge.phpdt.html.aqua" context="html" enabled="true">#00FFFF</template>
+  <template name="#00ffff" description="Aqua (Color Code)" id="net.sourceforge.phpdt.html.aqua" context="html" enabled="true">#00ffff</template>
   <template name="#000000" description="Black (Color Code)" id="net.sourceforge.phpdt.html.black" context="html" enabled="true">#000000</template>
-  <template name="#0000FF" description="Blue (Color Code)" id="net.sourceforge.phpdt.html.blue" context="html" enabled="true">#0000FF</template>
-  <template name="#A52A2A" description="Brown (Color Code)" id="net.sourceforge.phpdt.html.brown" context="html" enabled="true">#A52A2A</template>
-  <template name="#00FFFF" description="Cyan (Color Code)" id="net.sourceforge.phpdt.html.cyan" context="html" enabled="true">#00FFFF</template>
-  <template name="#FF00FF" description="Fuchsia (Color Code)" id="net.sourceforge.phpdt.html.fuchsia" context="html" enabled="true">#FF00FF</template>
-  <template name="#FFD700" description="Gold (Color Code)" id="net.sourceforge.phpdt.html.gold" context="html" enabled="true">#FFD700</template>
+  <template name="#0000ff" description="Blue (Color Code)" id="net.sourceforge.phpdt.html.blue" context="html" enabled="true">#0000ff</template>
+  <template name="#a52a2a" description="Brown (Color Code)" id="net.sourceforge.phpdt.html.brown" context="html" enabled="true">#a52a2a</template>
+  <template name="#00ffff" description="Cyan (Color Code)" id="net.sourceforge.phpdt.html.cyan" context="html" enabled="true">#00ffff</template>
+  <template name="#ff00ff" description="Fuchsia (Color Code)" id="net.sourceforge.phpdt.html.fuchsia" context="html" enabled="true">#ff00ff</template>
+  <template name="#ffd700" description="Gold (Color Code)" id="net.sourceforge.phpdt.html.gold" context="html" enabled="true">#ffd700</template>
   <template name="#808080" description="Gray (Color Code)" id="net.sourceforge.phpdt.html.gray" context="html" enabled="true">#808080</template>
   <template name="#008000" description="Green (Color Code)" id="net.sourceforge.phpdt.html.green" context="html" enabled="true">#008000</template>
-  <template name="#00FF00" description="Lime (Color Code)" id="net.sourceforge.phpdt.html.lime" context="html" enabled="true">#00FF00</template>
-  <template name="#FF00FF" description="Magenta (Color Code)" id="net.sourceforge.phpdt.html.magenta" context="html" enabled="true">#FF00FF</template>
+  <template name="#00ff00" description="Lime (Color Code)" id="net.sourceforge.phpdt.html.lime" context="html" enabled="true">#00ff00</template>
+  <template name="#ff00ff" description="Magenta (Color Code)" id="net.sourceforge.phpdt.html.magenta" context="html" enabled="true">#ff00ff</template>
   <template name="#800000" description="Maroon (Color Code)" id="net.sourceforge.phpdt.html.maroon" context="html" enabled="true">#800000</template>
   <template name="#000080" description="Navy (Color Code)" id="net.sourceforge.phpdt.html.navy" context="html" enabled="true">#000080</template>
   <template name="#808000" description="Olive (Color Code)" id="net.sourceforge.phpdt.html.olive" context="html" enabled="true">#808000</template>
-  <template name="#FFA500" description="Orange (Color Code)" id="net.sourceforge.phpdt.html.orange" context="html" enabled="true">#FFA500</template>
-  <template name="#FFC0CB" description="Pink (Color Code)" id="net.sourceforge.phpdt.html.pink" context="html" enabled="true">#FFC0CB</template>
+  <template name="#ffa500" description="Orange (Color Code)" id="net.sourceforge.phpdt.html.orange" context="html" enabled="true">#ffa500</template>
+  <template name="#ffc0cb" description="Pink (Color Code)" id="net.sourceforge.phpdt.html.pink" context="html" enabled="true">#ffc0cb</template>
   <template name="#800080" description="Purple (Color Code)" id="net.sourceforge.phpdt.html.purple" context="html" enabled="true">#800080</template>
-  <template name="#FF0000" description="Red (Color Code)" id="net.sourceforge.phpdt.html.red" context="html" enabled="true">#FF0000</template>
-  <template name="#C0C0C0" description="Silver (Color Code)" id="net.sourceforge.phpdt.html.silver" context="html" enabled="true">#C0C0C0</template>
+  <template name="#ff0000" description="Red (Color Code)" id="net.sourceforge.phpdt.html.red" context="html" enabled="true">#ff0000</template>
+  <template name="#c0c0c0" description="Silver (Color Code)" id="net.sourceforge.phpdt.html.silver" context="html" enabled="true">#c0c0c0</template>
   <template name="#008080" description="Teal (Color Code)" id="net.sourceforge.phpdt.html.teal" context="html" enabled="true">#008080</template>
-  <template name="#FFFFFF" description="White (Color Code)" id="net.sourceforge.phpdt.html.white" context="html" enabled="true">#FFFFFF</template>
-  <template name="#FFFF00" description="Yellow (Color Code)" id="net.sourceforge.phpdt.html.yellow" context="html" enabled="true">#FFFF00</template>
+  <template name="#ffffff" description="White (Color Code)" id="net.sourceforge.phpdt.html.white" context="html" enabled="true">#ffffff</template>
+  <template name="#ffff00" description="Yellow (Color Code)" id="net.sourceforge.phpdt.html.yellow" context="html" enabled="true">#ffff00</template>
 
-  <template name="Aqua" description="Aqua (Color Code)" id="net.sourceforge.phpdt.html.ccaqua" context="html" enabled="true">#00FFFF</template>
+  <template name="Aqua" description="Aqua (Color Code)" id="net.sourceforge.phpdt.html.ccaqua" context="html" enabled="true">#00ffff</template>
   <template name="Black" description="Black (Color Code)" id="net.sourceforge.phpdt.html.ccblack" context="html" enabled="true">#000000</template>
-  <template name="Blue" description="Blue (Color Code)" id="net.sourceforge.phpdt.html.ccblue" context="html" enabled="true">#0000FF</template>
-  <template name="Brown" description="Brown (Color Code)" id="net.sourceforge.phpdt.html.ccbrown" context="html" enabled="true">#A52A2A</template>
-  <template name="Cyan" description="Cyan (Color Code)" id="net.sourceforge.phpdt.html.cccyan" context="html" enabled="true">#00FFFF</template>
-  <template name="Fuchsia" description="Fuchsia (Color Code)" id="net.sourceforge.phpdt.html.ccfuchsia" context="html" enabled="true">#FF00FF</template>
-  <template name="Gold" description="Gold (Color Code)" id="net.sourceforge.phpdt.html.ccgold" context="html" enabled="true">#FFD700</template>
+  <template name="Blue" description="Blue (Color Code)" id="net.sourceforge.phpdt.html.ccblue" context="html" enabled="true">#0000ff</template>
+  <template name="Brown" description="Brown (Color Code)" id="net.sourceforge.phpdt.html.ccbrown" context="html" enabled="true">#a52a2a</template>
+  <template name="Cyan" description="Cyan (Color Code)" id="net.sourceforge.phpdt.html.cccyan" context="html" enabled="true">#00ffff</template>
+  <template name="Fuchsia" description="Fuchsia (Color Code)" id="net.sourceforge.phpdt.html.ccfuchsia" context="html" enabled="true">#ff00ff</template>
+  <template name="Gold" description="Gold (Color Code)" id="net.sourceforge.phpdt.html.ccgold" context="html" enabled="true">#ffd700</template>
   <template name="Gray" description="Gray (Color Code)" id="net.sourceforge.phpdt.html.ccgray" context="html" enabled="true">#808080</template>
   <template name="Green" description="Green (Color Code)" id="net.sourceforge.phpdt.html.ccgreen" context="html" enabled="true">#008000</template>
-  <template name="Lime" description="Lime (Color Code)" id="net.sourceforge.phpdt.html.cclime" context="html" enabled="true">#00FF00</template>
-  <template name="Magenta" description="Magenta (Color Code)" id="net.sourceforge.phpdt.html.ccmagenta" context="html" enabled="true">#FF00FF</template>
+  <template name="Lime" description="Lime (Color Code)" id="net.sourceforge.phpdt.html.cclime" context="html" enabled="true">#00ff00</template>
+  <template name="Magenta" description="Magenta (Color Code)" id="net.sourceforge.phpdt.html.ccmagenta" context="html" enabled="true">#ff00ff</template>
   <template name="Maroon" description="Maroon (Color Code)" id="net.sourceforge.phpdt.html.ccmaroon" context="html" enabled="true">#800000</template>
   <template name="Navy" description="Mavy (Color Code)" id="net.sourceforge.phpdt.html.ccnavy" context="html" enabled="true">#000080</template>
   <template name="Olive" description="Olive (Color Code)" id="net.sourceforge.phpdt.html.ccolive" context="html" enabled="true">#808000</template>
-  <template name="Orange" description="Orange (Color Code)" id="net.sourceforge.phpdt.html.ccorange" context="html" enabled="true">#FFA500</template>
-  <template name="Pink" description="Pink (Color Code)" id="net.sourceforge.phpdt.html.ccpink" context="html" enabled="true">#FFC0CB</template>
+  <template name="Orange" description="Orange (Color Code)" id="net.sourceforge.phpdt.html.ccorange" context="html" enabled="true">#ffa500</template>
+  <template name="Pink" description="Pink (Color Code)" id="net.sourceforge.phpdt.html.ccpink" context="html" enabled="true">#ffc0cb</template>
   <template name="Purple" description="Purple (Color Code)" id="net.sourceforge.phpdt.html.ccpurple" context="html" enabled="true">#800080</template>
-  <template name="Red" description="Red (Color Code)" id="net.sourceforge.phpdt.html.ccred" context="html" enabled="true">#FF0000</template>
-  <template name="Silver" description="Silver (Color Code)" id="net.sourceforge.phpdt.html.ccsilver" context="html" enabled="true">#C0C0C0</template>
+  <template name="Red" description="Red (Color Code)" id="net.sourceforge.phpdt.html.ccred" context="html" enabled="true">#ff0000</template>
+  <template name="Silver" description="Silver (Color Code)" id="net.sourceforge.phpdt.html.ccsilver" context="html" enabled="true">#c0c0c0</template>
   <template name="Teal" description="Teal (Color Code)" id="net.sourceforge.phpdt.html.ccteal" context="html" enabled="true">#008080</template>
-  <template name="White" description="White (Color Code)" id="net.sourceforge.phpdt.html.ccwhite" context="html" enabled="true">#FFFFFF</template>
-  <template name="Yellow" description="Yellow (Color Code)" id="net.sourceforge.phpdt.html.ccyellow" context="html" enabled="true">#FFFF00</template>
+  <template name="White" description="White (Color Code)" id="net.sourceforge.phpdt.html.ccwhite" context="html" enabled="true">#ffffff</template>
+  <template name="Yellow" description="Yellow (Color Code)" id="net.sourceforge.phpdt.html.ccyellow" context="html" enabled="true">#ffff00</template>
   <template name="&lt;br&gt;" description="&lt;br&gt;" id="net.sourceforge.phpdt.html.br" context="html" enabled="true">&lt;br /&gt;${cursor}</template>
   <template name="&lt;div&gt;" description="div block with id" id="net.sourceforge.phpdt.html.div" context="html" enabled="true">&lt;div id=&quot;${id}&quot;&gt;${cursor}&lt;/div&gt;</template>
   <template name="&lt;strong&gt;" description="&lt;strong&gt;" id="net.sourceforge.phpdt.html.strong" context="html" enabled="true">&lt;strong&gt;${cursor}&lt;/strong&gt;</template>
@@ -435,7 +355,8 @@ ${cursor}
 ${cursor}
 {else}
 
-{/if}</template><template name="{include" description="{include file=&quot;&quot;} (Smarty)" id="net.sourceforge.phpdt.html.smarty_include1" context="html" enabled="true">{include file=&quot;${file}&quot;}</template>
+{/if}</template>
+<template name="{include" description="{include file=&quot;&quot;} (Smarty)" id="net.sourceforge.phpdt.html.smarty_include1" context="html" enabled="true">{include file=&quot;${file}&quot;}</template>
 <template name="{include_php" description="{include_php file=&quot;&quot;} (Smarty)" id="net.sourceforge.phpdt.html.smarty_include2" context="html" enabled="true">{include_php file=&quot;${file}&quot;}</template>
 <template name="{ldelim}" description="{ldelim} (Smarty)" id="net.sourceforge.phpdt.html.smarty_ldelim" context="html" enabled="true">{ldelim}</template>
 <template name="{literal" description="{literal}{/literal} (Smarty)" id="net.sourceforge.phpdt.html.smarty_literal" context="html" enabled="true">{literal}
@@ -444,11 +365,13 @@ ${cursor}
 <template name="{rdelim}" description="{rdelim} (Smarty)" id="net.sourceforge.phpdt.html.smarty_rdelim" context="html" enabled="true">{rdelim}</template>
 <template name="{section" description="{section }{/section} (Smarty)" id="net.sourceforge.phpdt.html.smarty_section1" context="html" enabled="true">{section name=${name} loop=$$${loop}}
 ${cursor}
-{/section}</template><template name="{section" description="{section}{sectionelse}{/section} (Smarty)" id="net.sourceforge.phpdt.html.smarty_section2" context="html" enabled="true">{section name=${name} loop=$$${loop}}
+{/section}</template>
+<template name="{section" description="{section}{sectionelse}{/section} (Smarty)" id="net.sourceforge.phpdt.html.smarty_section2" context="html" enabled="true">{section name=${name} loop=$$${loop}}
 ${cursor}
 {sectionelse}
 
-{/section}</template><template name="{smarty.cookies.var}" description="{$smarty.cookies.var} (Smarty)" id="net.sourceforge.phpdt.html.smarty_cookies" context="html" enabled="true">{$$smarty.cookies.${var}}</template>
+{/section}</template>
+<template name="{smarty.cookies.var}" description="{$smarty.cookies.var} (Smarty)" id="net.sourceforge.phpdt.html.smarty_cookies" context="html" enabled="true">{$$smarty.cookies.${var}}</template>
 <template name="{smarty.env.var}" description="{$smarty.env.var} (Smarty)" id="net.sourceforge.phpdt.html.smarty_env" context="html" enabled="true">{$$smarty.env.${var}}</template>
 <template name="{smarty.get.var}" description="{$smarty.get.var} (Smarty)" id="net.sourceforge.phpdt.html.smarty_get" context="html" enabled="true">{$$smarty.get.${var}}</template>
 <template name="{smarty.now|date_format}" description="{$smarty.now|date_format} (Smarty)" id="net.sourceforge.phpdt.html.smarty__now1" context="html" enabled="true">{$$smarty.now|date_format:&quot;%Y-%m-%d %H:%M:%S&quot;}</template>
diff --git a/net.sourceforge.phpeclipse/templates/default-templates.xml b/net.sourceforge.phpeclipse/templates/default-templates.xml
index 352bfbf..b8842d0 100644
--- a/net.sourceforge.phpeclipse/templates/default-templates.xml
+++ b/net.sourceforge.phpeclipse/templates/default-templates.xml
@@ -1,70 +1,88 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates>
 <template name="class" description="class template with constructor" id="net.sourceforge.phpdt.php.class1" context="php" enabled="true">class ${class_name} {
-  function ${class_name}() {
-	  ${cursor}
-  }
+	function ${class_name}() {
+		${cursor}
+	}
 }</template>
 <template name="class" description="class with attribute" id="net.sourceforge.phpdt.php.class2" context="php" enabled="true">class ${class_name} {
-  var $$${attribute};
-  function ${class_name}() {
-	  ${cursor}
-  }
-  
-  function set_${attribute}( $$${attr} ) {
-    $$this->${attribute} = $$${attr};
+	var $$${attribute};
+	function ${class_name}() {
+		${cursor}
 	}
-
+	
+	function set_${attribute}( $$${attr} ) {
+		$$this->${attribute} = $$${attr};
+	}
+	
 	function get_${attribute}() {
-    return $$this->${attribute};
+		return $$this->${attribute};
 	}
 }</template>
-<template name="for" description="iterate over array" id="net.sourceforge.phpdt.php.for1" context="php" enabled="true">for ($$${index} = 0; $$${index} &lt; sizeof($$${array}); $$${index}++) {
+<template name="for" description="iterate over array" id="net.sourceforge.phpdt.php.for1" context="php" enabled="true">for ( $$${index} = 0, $$${index2} = sizeof($$${array}); $$${index} &lt; $$${index2}; $$${index}++ ) {
 	${cursor}
 }</template>
-<template name="for" description="iterate over array w/ temporary variable" id="net.sourceforge.phpdt.php.for2" context="php" enabled="true">for ($$${index} = 0; $$${index} &lt; sizeof($$${array}); $$${index}++) {
+<template name="for" description="iterate over array w/ temporary variable" id="net.sourceforge.phpdt.php.for2" context="php" enabled="true">for ($$${index} = 0, $$${index2} = sizeof($$${array}); $$${index} &lt; $$${index2}; $$${index}++) {
 	$$${array_element} = $$${array}[$$${index}];
 	${cursor}
 }</template>
-<template name="function" description="function template" id="net.sourceforge.phpdt.php.function1" context="php" enabled="true">function ${function_name} () {
+<template name="try-catch" description="try-catch block - default" id="net.sourceforge.phpdt.php.try1" context="php" enabled="true">try {
+	${try}
+}
+catch( Exception $$${e} ) {
+	${catch}
+}</template>
+<template name="try-catch" description="try-catch block - custom Exception" id="net.sourceforge.phpdt.php.try2" context="php" enabled="true">try {
+	${try}
+}
+catch( ${Exception} $$${e} ) {
+	${catch}
+}</template>
+<template name="function" description="function template" id="net.sourceforge.phpdt.php.function1" context="php" enabled="true">function ${function_name}() {
 	${cursor}
 }</template>
-<template name="function" description="function template with return" id="net.sourceforge.phpdt.php.function2" context="php" enabled="true">function ${function_name} () {
-	return (${cursor});
+<template name="function" description="function template with return" id="net.sourceforge.phpdt.php.function2" context="php" enabled="true">function ${function_name}() {
+	return ( ${cursor} );
 }</template>
-<template name="while" description="while iteration" id="net.sourceforge.phpdt.php.while" context="php" enabled="true">while (${condition}) {
+<template name="while" description="while iteration" id="net.sourceforge.phpdt.php.while" context="php" enabled="true">while ( ${condition} ) {
 	${cursor}
 }</template>
 <template name="do" description="do iteraation" id="net.sourceforge.phpdt.php.do" context="php" enabled="true">do {
 	${line_selection}${cursor}
-} while (${condition});</template>
-<template name="switch" description="switch case statement" id="net.sourceforge.phpdt.php.switch" context="php" enabled="true">switch (${key}) {
+} while ( ${condition} );</template>
+<template name="switch" description="switch case statement" id="net.sourceforge.phpdt.php.switch" context="php" enabled="true">switch ( ${key} ) {
 	case ${value}:
 		${cursor}
 		break;
-
+		
 	default:
 		break;
-}</template><template name="if" description="if statement" id="net.sourceforge.phpdt.php.if" context="php" enabled="true">if (${condition}) {
+}</template>
+<template name="if" description="if statement" id="net.sourceforge.phpdt.php.if" context="php" enabled="true">if ( ${condition} ) {
 	${cursor}
-}</template><template name="ifelse" description="if else statement" id="net.sourceforge.phpdt.php.ifelse" context="php" enabled="true">if (${condition}) {
+}</template>
+<template name="ifelse" description="if else statement" id="net.sourceforge.phpdt.php.ifelse" context="php" enabled="true">if ( ${condition} ) {
 	${cursor}
-} else {
+}
+else {
 	
-}</template><template name="elseif" description="else if block" id="net.sourceforge.phpdt.php.elseif" context="php" enabled="true">elseif (${condition}) {
+}</template>
+<template name="elseif" description="else if block" id="net.sourceforge.phpdt.php.elseif" context="php" enabled="true">elseif (${condition}) {
 	${cursor}
-}</template><template name="else" description="else block" id="net.sourceforge.phpdt.php.else" context="php" enabled="true">else {
+}</template>
+<template name="else" description="else block" id="net.sourceforge.phpdt.php.else" context="php" enabled="true">else {
 	${cursor}
 }</template>
 <template name="filecomment" description="file comment used by the class and interface wizards" id="net.sourceforge.phpdt.php.filecomment" context="php" enabled="true">/**
- * Created on ${date} by ${user}
+ *	Created on ${date} by ${user}
  *
- */</template><template name="functioncomment" description="function comment" id="net.sourceforge.phpdt.php.functioncomment" context="php" enabled="true">/**
- * @author ${user}
+ */</template>
+<template name="functioncomment" description="function comment" id="net.sourceforge.phpdt.php.functioncomment" context="php" enabled="true">/**
+ *	@author ${user}
  *
  */</template>
- <template name="echo" description="echo a string" id="net.sourceforge.phpdt.php.echo" context="php" enabled="true">echo "${string}";
-  ${cursor}</template>
+ <template name="echo" description="echo a string" id="net.sourceforge.phpdt.php.echo" context="php" enabled="true">echo '${string}';
+${cursor}</template>
 
   <!-- phpdoc -->
 
-- 
1.7.1