From: scorphus <scorphus>
Date: Mon, 7 Apr 2008 14:07:31 +0000 (+0000)
Subject: Applying pteague's patch (re #685)
X-Git-Url: http://git.phpeclipse.com

Applying pteague's patch (re #685)
---

diff --git a/net.sourceforge.phpeclipse.ui/templates/default-templates.xml b/net.sourceforge.phpeclipse.ui/templates/default-templates.xml
index aac90e5..46deae9 100644
--- a/net.sourceforge.phpeclipse.ui/templates/default-templates.xml
+++ b/net.sourceforge.phpeclipse.ui/templates/default-templates.xml
@@ -1,13 +1,16 @@
 <?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, ${index2} = ${array}.length; ${index} &lt; ${index2}; ${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 version="1.0" encoding="UTF-8" ?&gt;</template>
 
   <template name="&lt;html" description="html page with head,title,body" 
-  id="net.sourceforge.phpdt.html.html" context="html" enabled="true">&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+  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;
@@ -21,7 +24,8 @@ ${cursor}
 &lt;/body&gt;
 &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;
+  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;
@@ -34,9 +38,11 @@ ${cursor}
 ${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> 
+  <template name="&lt;title" description="title" id="net.sourceforge.phpdt.html.title" context="html" enabled="true"
+  >&lt;title&gt;${title}&lt;/title&gt;</template> 
   
-  <template name="&lt;table" description="3x3 table" id="net.sourceforge.phpdt.html.table" context="html" enabled="true">&lt;table&gt;
+  <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;
@@ -54,7 +60,8 @@ ${cursor}
 	&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;
+  <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;
@@ -78,80 +85,115 @@ ${cursor}</template>
 &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}" 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;
+  <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;
+  <template name="&lt;hr" description="horizontal line" id="net.sourceforge.phpdt.html.hr" context="html" enabled="true"
+  >&lt;hr /&gt;</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;
+  <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;
+  <template name="&lt;dl" description="term list" id="net.sourceforge.phpdt.html.dl_term" context="html" enabled="true"
+  >&lt;dl&gt;
+	&lt;dt&gt;${term1}&lt;/dt&gt;
+	&lt;dt&gt;${term2}&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;
+  <template name="&lt;dl" description="definition list" id="net.sourceforge.phpdt.html.dl_list" context="html" enabled="true"
+  >&lt;dl&gt;
+	&lt;dt&gt;${term1}&lt;/dt&gt;
+		&lt;dd&gt;${definition1}&lt;/dd&gt;
+	&lt;dt&gt;${term2}&lt;/dt&gt;
+		&lt;dd&gt;${definition2}&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}
+  <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}
+  <template name="&lt;form" description="form post" id="net.sourceforge.phpdt.html.form_post1" context="html" enabled="true"
+  >&lt;form action="${link}" method="post"&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;
+  <template name="&lt;form" description="form post with enctype" id="net.sourceforge.phpdt.html.form_post2" context="html" enabled="true"
+  >&lt;form action="${link}" method="post" enctype="application/x-www-form-urlencoded"&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" 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;
+ <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="${size}" maxlength="${size}" /&gt;</template>
+  <template name="&lt;input" description="input type=text (form) with id" id="net.sourceforge.phpdt.html.form_input_text2" context="html" enabled="true"
+  >&lt;input type="text" class="text" name="${name}" id="${name}" value="${value}" size="${size}" maxlength="${size}" /&gt;</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="${size}" maxlength="${size}" /&gt;</template>
+  <template name="&lt;input" description="input type=password (form) with id" id="net.sourceforge.phpdt.html.form_input_password2" context="html" enabled="true"
+  >&lt;input type="password" class="password" name="${name}" id="${name}" size="${size}" maxlength="${size}" /&gt;</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;</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;</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;</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 button" name="${name}" value="${value}" /&gt;</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 button" name="${name}" value="${value}" /&gt;</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;</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;
+  <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;</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;</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;
+  <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>
   <template name="&amp;quot" description="quot" id="net.sourceforge.phpdt.html.quot" context="html" enabled="true">&amp;quot;</template>
@@ -307,6 +349,9 @@ ${cursor}
   <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>
+
+<!-- Smarty templates -->
+
   <template name="{" description="{* *} (Smarty comment)" id="net.sourceforge.phpdt.html.smarty_comment" context="html" enabled="true">{* ${cursor} *}</template>
   <template name="{assign" description="{assign var= value= } (Smarty)" id="net.sourceforge.phpdt.html.smarty_assign" context="html" enabled="true">{assign var=&quot;${name}&quot; value=&quot;${value}&quot;}</template>
   <template name="{capture" description="{capture }{/capture} (Smarty)" id="net.sourceforge.phpdt.html.smarty_capture" context="html" enabled="true">{capture name=${name}}
@@ -404,4 +449,4 @@ ${cursor}
 <template name="{var|truncate}" description="{$var|truncate} (Smarty)" id="net.sourceforge.phpdt.html.smarty_var_truncate" context="html" enabled="true">{$$${var}|truncate:${nr}}</template>
 <template name="{var|upper}" description="{$var|upper} (Smarty)" id="net.sourceforge.phpdt.html.smarty_var_upper" context="html" enabled="true">{$$${var}|upper}</template>
 <template name="{var|wordwrap}" description="{$var|wordwrap} (Smarty)" id="net.sourceforge.phpdt.html.smarty_var_wordwrap" context="html" enabled="true">{$$${var}|wordwrap:${nr}:&quot;${sign}&quot;}</template>
-</templates>
\ No newline at end of file
+</templates>