X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/default-templates.xml b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/default-templates.xml
index 2a1d730..c684ed0 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/default-templates.xml
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/default-templates.xml
@@ -62,17 +62,33 @@
  */</template>
  <template name="echo" description="echo a string" context="php" enabled="true">echo "${string}";
   ${cursor}</template>
-  
-  
-  <template name="&amp;nbsp" description="no-break space " context="html" enabled="true">&amp;nbsp
-  </template>
 
+  <!-- phpdoc -->
+
+  <template description="&lt;code&gt;&lt;/code&gt;" name="&lt;code&gt;" context="phpdoc"
+  >&lt;code&gt;${cursor}&lt;/code&gt;</template>
+
+  <template description="&lt;code&gt;null&lt;/code&gt;" name="&lt;code&gt;" context="phpdoc"
+  >&lt;code&gt;null&lt;/code&gt;</template>
+
+  <template description="&lt;pre&gt;&lt;/pre&gt;" name="&lt;pre&gt;" context="phpdoc"
+  >&lt;pre&gt;${cursor}&lt;/pre&gt;</template>
+
+  <template description="&lt;b&gt;&lt;/b&gt;" name="&lt;b&gt;" context="phpdoc"
+  >&lt;b&gt;${cursor}&lt;/b&gt;</template>
+
+  <template description="&lt;i&gt;&lt;/i&gt;" name="&lt;i&gt;" context="phpdoc"
+  >&lt;i&gt;${cursor}&lt;/i&gt;</template>
+
+  <template description="author name" name="@author" context="phpdoc"
+  >@author ${user}</template>
+  
   <template name="&lt;html" description="html page with head,title,body" context="html" enabled="true">
   &lt;html&gt;
   &lt;head&gt;
   &lt;title&gt;${title}&lt;/title&gt;
   &lt;/head&gt;
-  &lt;body&gt;
+  &lt;body bgcolor="#FFFFFF" text="#000000" link="#FF9966" vlink="#FF9966" alink="#FFCC99"&gt;
   ${cursor}
   &lt;/body&gt;
   &lt;/html&gt;
@@ -125,10 +141,289 @@
   <template name="&lt;p" description="paragraph" context="html" enabled="true">
   &lt;p&gt;${cursor}&lt;/p&gt;
   </template>
-  <template name="&lt;pre" description="preformated text" context="html" enabled="true">
+  <template name="&lt;h1" description="heading 1" context="html" enabled="true">
+  &lt;h1&gt;${cursor}&lt;/h1&gt;
+  </template>
+  <template name="&lt;h2" description="heading 2" context="html" enabled="true">
+  &lt;h2&gt;${cursor}&lt;/h2&gt;
+  </template>
+  <template name="&lt;h3" description="heading 3" context="html" enabled="true">
+  &lt;h3&gt;${cursor}&lt;/h3&gt;
+  </template>
+  <template name="&lt;h4" description="heading 4" context="html" enabled="true">
+  &lt;h4&gt;${cursor}&lt;/h4&gt;
+  </template>
+  <template name="&lt;h5" description="heading 5" context="html" enabled="true">
+  &lt;h5&gt;${cursor}&lt;/h5&gt;
+  </template>
+  <template name="&lt;h6" description="heading 6" context="html" enabled="true">
+  &lt;h6&gt;${cursor}&lt;/h6&gt;
+  </template>
+  <template name="&lt;address" description="address" context="html" enabled="true">
+  &lt;address&gt;${cursor}&lt;/address&gt;
+  </template>
+  <template name="&lt;pre" description="preformat" context="html" enabled="true">
   &lt;pre&gt;${cursor}&lt;/pre&gt;
   </template>
-  <template name="&lt;blockquote" description="blockquoted text" context="html" enabled="true">
-  &lt;blockquote&gt;${cursor}&lt;/blockquote&gt;
+  <template name="&lt;code" description="code block" context="html" enabled="true">
+  &lt;code&gt;${cursor}&lt;/code&gt;
+  </template>
+  <template name="&lt;blockquote" description="blockquote" context="html" enabled="true">
+  &lt;blockquote&gt;${cursor}&lt;br/&gt;
+  &lt;/blockquote&gt;
+  </template>
+  <template name="&lt;hr" description="horizontal line" context="html" enabled="true">
+  &lt;hr width="100%" size="2"&gt;
+  ${cursor}
+  </template>
+  <template name="&lt;ul" description="bulleted list" 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" 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" 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" 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" context="html" enabled="true">
+  &lt;form action="${link}" method="${get}"&gt;
+  ${cursor}
+  &lt;/form&gt;
+  </template>
+  <template name="&lt;form" description="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" 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)" 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)" 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)" context="html" enabled="true">
+  &lt;input type="radio" name="${name}" value="${value}"/&gt;
+  ${cursor}
+  </template>
+  <template name="&lt;input" description="input type=checkbox (form)" 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)" 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)" 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)" context="html" enabled="true">
+  &lt;input type="reset" name="${name}" value="${value}"/&gt;
+  ${cursor}
+  </template>
+  <template name="&lt;textarea" description="textarea (form)" 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)" 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>
- </templates>
\ No newline at end of file
+  <template name="&lt;xml" description="xml version=1.0" context="html" enabled="true">
+  &lt;?xml version="1.0"?&gt;
+  ${cursor}
+  </template>
+  <template name="&lt;xml" description="xml-stylesheet type=text/xsl" context="html" enabled="true">
+  &lt;?xml-stylesheet type="text/xsl" href="${url}"&gt;
+  ${cursor}
+  </template>
+  <template name="&lt;script" description="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" context="html" enabled="true">&lt;script language="JavaScript" type="text/javascript" src="${jsfile}.js"&gt;&lt;/script&gt;${cursor}
+  </template>
+  <template name="&lt;style" description="style text/css" context="html" enabled="true">&lt;/style type="text/css"&gt;
+<!--
+  ${cursor}
+-->
+&lt;/style&gt;
+  </template>
+  <template name="&amp;quot" description="quot" context="html" enabled="true">&amp;quot;</template>
+  <template name="&amp;amp" description="ampersand" context="html" enabled="true">&amp;amp;</template>
+  <template name="&amp;lt" description="less than" context="html" enabled="true">&amp;lt;</template>
+  <template name="&amp;gt" description="greater than" context="html" enabled="true">&amp;gt;</template>
+  
+  <template name="&amp;nbsp" description="no-break space" context="html" enabled="true">&amp;nbsp;</template>
+  <template name="&amp;iexcl" description="iexcl" context="html" enabled="true">&amp;iexcl;</template>
+  <template name="&amp;cent" description="cent" context="html" enabled="true">&amp;cent;</template>
+  <template name="&amp;pound" description="pound" context="html" enabled="true">&amp;pound;</template>
+  <template name="&amp;curren" description="curren" context="html" enabled="true">&amp;curren;</template>
+  <template name="&amp;yen" description="yen" context="html" enabled="true">&amp;yen;</template>
+  <template name="&amp;brvbar" description="brvbar" context="html" enabled="true">&amp;brvbar;</template>
+  <template name="&amp;brkbar" description="brkbar" context="html" enabled="true">&amp;brkbar;</template>
+  <template name="&amp;sect" description="sect" context="html" enabled="true">&amp;sect;</template>
+  <template name="&amp;uml" description="uml" context="html" enabled="true">&amp;uml;</template>
+  <template name="&amp;die" description="die" context="html" enabled="true">&amp;die;</template>
+  <template name="&amp;copy" description="copy" context="html" enabled="true">&amp;copy;</template>
+  <template name="&amp;ordf" description="ordf" context="html" enabled="true">&amp;ordf;</template>
+  <template name="&amp;laquo" description="laquo" context="html" enabled="true">&amp;laquo;</template>
+  <template name="&amp;not" description="not" context="html" enabled="true">&amp;not;</template>
+  <template name="&amp;shy" description="shy" context="html" enabled="true">&amp;shy;</template>
+  <template name="&amp;reg" description="reg" context="html" enabled="true">&amp;reg;</template>
+  <template name="&amp;macr" description="macr" context="html" enabled="true">&amp;macr;</template>
+  <template name="&amp;hibar" description="hibar" context="html" enabled="true">&amp;hibar;</template>
+  <template name="&amp;deg" description="deg" context="html" enabled="true">&amp;deg;</template>
+  <template name="&amp;plusmn" description="plusmn" context="html" enabled="true">&amp;plusmn;</template>
+  <template name="&amp;sup2" description="sup2" context="html" enabled="true">&amp;sup2;</template>
+  <template name="&amp;sup3" description="sup3" context="html" enabled="true">&amp;sup3;</template>
+  <template name="&amp;acute" description="acute" context="html" enabled="true">&amp;acute;</template>
+  <template name="&amp;micro" description="micro" context="html" enabled="true">&amp;micro;</template>
+  <template name="&amp;para" description="para" context="html" enabled="true">&amp;para;</template>
+  <template name="&amp;middot" description="middot" context="html" enabled="true">&amp;middot;</template>
+  <template name="&amp;cedil" description="cedil" context="html" enabled="true">&amp;cedil;</template>
+  <template name="&amp;sup1" description="sup1" context="html" enabled="true">&amp;sup1;</template>
+  <template name="&amp;ordm" description="ordm" context="html" enabled="true">&amp;ordm;</template>
+  <template name="&amp;raquo" description="raquo" context="html" enabled="true">&amp;raquo;</template>
+  <template name="&amp;frac14" description="frac14" context="html" enabled="true">&amp;frac14;</template>
+  <template name="&amp;frac12" description="frac12" context="html" enabled="true">&amp;frac12;</template>
+  <template name="&amp;frac34" description="frac34" context="html" enabled="true">&amp;frac34;</template>
+  <template name="&amp;iquest" description="iquest" context="html" enabled="true">&amp;iquest;</template>
+  <template name="&amp;Agrave" description="Agrave" context="html" enabled="true">&amp;Agrave;</template>
+  <template name="&amp;Aacute" description="Aacute" context="html" enabled="true">&amp;Aacute;</template>
+  <template name="&amp;Acirc" description="Acirc" context="html" enabled="true">&amp;Acirc;</template>
+  <template name="&amp;Atilde" description="Atilde" context="html" enabled="true">&amp;Atilde;</template>
+  <template name="&amp;Auml" description="Auml" context="html" enabled="true">&amp;Auml;</template>
+  <template name="&amp;Aring" description="Aring" context="html" enabled="true">&amp;Aring;</template>
+  <template name="&amp;AElig" description="AElig" context="html" enabled="true">&amp;AElig;</template>
+  <template name="&amp;Ccedil" description="Ccedil" context="html" enabled="true">&amp;Ccedil;</template>
+  <template name="&amp;Egrave" description="Egrave" context="html" enabled="true">&amp;Egrave;</template>
+  <template name="&amp;Eacute" description="Eacute" context="html" enabled="true">&amp;Eacute;</template>
+  <template name="&amp;Ecirc" description="Ecirc" context="html" enabled="true">&amp;Ecirc;</template>
+  <template name="&amp;Euml" description="Euml" context="html" enabled="true">&amp;Euml;</template>
+  <template name="&amp;lgrave" description="lgrave" context="html" enabled="true">&amp;lgrave;</template>
+  <template name="&amp;lacute" description="lacute" context="html" enabled="true">&amp;lacute;</template>
+  <template name="&amp;lcirc" description="lcirc" context="html" enabled="true">&amp;lcirc;</template>
+  <template name="&amp;luml" description="luml" context="html" enabled="true">&amp;luml;</template>
+  <template name="&amp;ETH" description="ETH" context="html" enabled="true">&amp;ETH;</template>
+  <template name="&amp;Ntilde" description="Ntilde" context="html" enabled="true">&amp;Ntilde;</template>
+  <template name="&amp;Ograve" description="Ograve" context="html" enabled="true">&amp;Ograve;</template>
+  <template name="&amp;Oacute" description="Oacute" context="html" enabled="true">&amp;Oacute;</template>
+  <template name="&amp;Ocirc" description="Ocirc" context="html" enabled="true">&amp;Ocirc;</template>
+  <template name="&amp;Otilde" description="Otilde" context="html" enabled="true">&amp;Otilde;</template>
+  <template name="&amp;Ouml" description="Ouml" context="html" enabled="true">&amp;Ouml;</template>
+  <template name="&amp;times" description="times" context="html" enabled="true">&amp;times;</template>
+  <template name="&amp;Oslash" description="Oslash" context="html" enabled="true">&amp;Oslash;</template>
+  <template name="&amp;Ugrave" description="Ugrave" context="html" enabled="true">&amp;Ugrave;</template>
+  <template name="&amp;Uacute" description="Uacute" context="html" enabled="true">&amp;Uacute;</template>
+  <template name="&amp;Ucirc" description="Ucirc" context="html" enabled="true">&amp;Ucirc;</template>
+  <template name="&amp;Uuml" description="Uuml" context="html" enabled="true">&amp;Uuml;</template>
+  <template name="&amp;Yacute" description="Yacute" context="html" enabled="true">&amp;Yacute;</template>
+  <template name="&amp;THORN" description="THORN" context="html" enabled="true">&amp;THORN;</template>
+  <template name="&amp;szlig" description="szlig" context="html" enabled="true">&amp;szlig;</template>
+  <template name="&amp;agrave" description="agrave" context="html" enabled="true">&amp;agrave;</template>
+  <template name="&amp;aacute" description="aacute" context="html" enabled="true">&amp;aacute;</template>
+  <template name="&amp;acirc" description="acirc" context="html" enabled="true">&amp;acirc;</template>
+  <template name="&amp;atilde" description="atilde" context="html" enabled="true">&amp;atilde;</template>
+  <template name="&amp;auml" description="auml" context="html" enabled="true">&amp;auml;</template>
+  <template name="&amp;aring" description="aring" context="html" enabled="true">&amp;aring;</template>
+  <template name="&amp;aelig" description="aelig" context="html" enabled="true">&amp;aelig;</template>
+  <template name="&amp;ccedil" description="ccedil" context="html" enabled="true">&amp;ccedil;</template>
+  <template name="&amp;egrave" description="egrave" context="html" enabled="true">&amp;egrave;</template>
+  <template name="&amp;eacute" description="eacute" context="html" enabled="true">&amp;eacute;</template>
+  <template name="&amp;ecirc" description="ecirc" context="html" enabled="true">&amp;ecirc;</template>
+  <template name="&amp;euml" description="euml" context="html" enabled="true">&amp;euml;</template>
+  <template name="&amp;igrave" description="igrave" context="html" enabled="true">&amp;igrave;</template>
+  <template name="&amp;iacute" description="iacute" context="html" enabled="true">&amp;iacute;</template>
+  <template name="&amp;icirc" description="icirc" context="html" enabled="true">&amp;icirc;</template>
+  <template name="&amp;iuml" description="iuml" context="html" enabled="true">&amp;iuml;</template>
+  <template name="&amp;eth" description="eth" context="html" enabled="true">&amp;eth;</template>
+  <template name="&amp;ntilde" description="ntilde" context="html" enabled="true">&amp;ntilde;</template>
+  <template name="&amp;ograve" description="ograve" context="html" enabled="true">&amp;ograve;</template>
+  <template name="&amp;oacute" description="oacute" context="html" enabled="true">&amp;oacute;</template>
+  <template name="&amp;ocirc" description="ocirc" context="html" enabled="true">&amp;ocirc;</template>
+  <template name="&amp;otilde" description="otilde" context="html" enabled="true">&amp;otilde;</template>
+  <template name="&amp;ouml" description="ouml" context="html" enabled="true">&amp;ouml;</template>
+  <template name="&amp;divide" description="divide" context="html" enabled="true">&amp;divide;</template>
+  <template name="&amp;oslash" description="oslash" context="html" enabled="true">&amp;oslash;</template>
+  <template name="&amp;ugrave" description="ugrave" context="html" enabled="true">&amp;ugrave;</template>
+  <template name="&amp;uacute" description="uacute" context="html" enabled="true">&amp;uacute;</template>
+  <template name="&amp;ucirc" description="ucirc" context="html" enabled="true">&amp;ucirc;</template>
+  <template name="&amp;uuml" description="uuml" context="html" enabled="true">&amp;uuml;</template>
+  <template name="&amp;yacute" description="yacute" context="html" enabled="true">&amp;yacute;</template>
+  <template name="&amp;thorn" description="thorn" context="html" enabled="true">&amp;thorn;</template>
+  <template name="&amp;yuml" description="yuml" context="html" enabled="true">&amp;yuml;</template>
+
+
+  
+  <template name="#000000" description="Black (Color Code)" context="html" enabled="true">#000000</template>
+  <template name="#0000FF" description="Blue (Color Code)" context="html" enabled="true">#0000FF</template>
+  <template name="#A52A2A" description="Brown (Color Code)" context="html" enabled="true">#A52A2A</template>
+  <template name="#00FFFF" description="Cyan (Color Code)" context="html" enabled="true">#00FFFF</template>
+  <template name="#FFD700" description="Gold (Color Code)" context="html" enabled="true">#FFD700</template>
+  <template name="#808080" description="Grey (Color Code)" context="html" enabled="true">#808080</template>
+  <template name="#008000" description="Green (Color Code)" context="html" enabled="true">#008000</template>
+  <template name="#FF00FF" description="Magenta (Color Code)" context="html" enabled="true">#FF00FF</template>
+  <template name="#FFA500" description="Orange (Color Code)" context="html" enabled="true">#FFA500</template>
+  <template name="#FFC0CB" description="Pink (Color Code)" context="html" enabled="true">#FFC0CB</template>
+  <template name="#800080" description="Purple (Color Code)" context="html" enabled="true">#800080</template>
+  <template name="#FF0000" description="Red (Color Code)" context="html" enabled="true">#FF0000</template>
+  <template name="#C0C0C0" description="Silver (Color Code)" context="html" enabled="true">#C0C0C0</template>
+  <template name="#FFFFFF" description="White (Color Code)" context="html" enabled="true">#FFFFFF</template>
+  <template name="#FFFF00" description="Yellow (Color Code)" context="html" enabled="true">#FFFF00</template>
+
+  <template name="Black" description="Black (Color Code)" context="html" enabled="true">#000000</template>
+  <template name="Blue" description="Blue (Color Code)" context="html" enabled="true">#0000FF</template>
+  <template name="Brown" description="Brown (Color Code)" context="html" enabled="true">#A52A2A</template>
+  <template name="Cyan" description="Cyan (Color Code)" context="html" enabled="true">#00FFFF</template>
+  <template name="Gold" description="Gold (Color Code)" context="html" enabled="true">#FFD700</template>
+  <template name="Grey" description="Grey (Color Code)" context="html" enabled="true">#808080</template>
+  <template name="Green" description="Green (Color Code)" context="html" enabled="true">#008000</template>
+  <template name="Magenta" description="Magenta (Color Code)" context="html" enabled="true">#FF00FF</template>
+  <template name="Orange" description="Orange (Color Code)" context="html" enabled="true">#FFA500</template>
+  <template name="Pink" description="Pink (Color Code)" context="html" enabled="true">#FFC0CB</template>
+  <template name="Purple" description="Purple (Color Code)" context="html" enabled="true">#800080</template>
+  <template name="Red" description="Red (Color Code)" context="html" enabled="true">#FF0000</template>
+  <template name="Silver" description="Silver (Color Code)" context="html" enabled="true">#C0C0C0</template>
+  <template name="White" description="White (Color Code)" context="html" enabled="true">#FFFFFF</template>
+  <template name="Yelow" description="Yellow (Color Code)" context="html" enabled="true">#FFFF00</template>
+
+</templates>
\ No newline at end of file