Applied patch from scorphus for bug#1685307

diff --git a/net.sourceforge.phpeclipse.ui/templates/default-templates.xml b/net.sourceforge.phpeclipse.ui/templates/default-templates.xml
index 9c2abec..1e8b109 100644 (file)
--- a/net.sourceforge.phpeclipse.ui/templates/default-templates.xml
+++ b/net.sourceforge.phpeclipse.ui/templates/default-templates.xml
@@ -21,6 +21,25 @@ ${cursor}
 </body>
 </html>
   </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;
+
+&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;/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> 
@@ -97,42 +116,42 @@ ${cursor}
   &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;${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;
+  &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;${item1}&lt;br /&gt;
     &lt;/li&gt;
-    &lt;li&gt;${item2}&lt;br/&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;${item1}&lt;br /&gt;
     &lt;/li&gt;
-    &lt;li&gt;${item2}&lt;br/&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;${item1}&lt;br /&gt;
     &lt;/dt&gt;
-    &lt;dt&gt;${item2}&lt;br/&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;${item1}&lt;br /&gt;
     &lt;/dd&gt;
-    &lt;dd&gt;${item2}&lt;br/&gt;
+    &lt;dd&gt;${item2}&lt;br /&gt;
     &lt;/dd&gt;
   &lt;/dl&gt;
   </template>
@@ -149,37 +168,37 @@ ${cursor}
   <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;
+  &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;
+  &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;
+  &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;
+  &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;
+  &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;
+  &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;
+  &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;
+  &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">
@@ -365,7 +384,7 @@ ${cursor}
   <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="&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;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>
   <template name="{" description="{* *} (Smarty comment)" id="net.sourceforge.phpdt.html.smarty_comment" context="html" enabled="true">{* ${cursor} *}</template>