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 4b23f16..8f2f29c 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
@@ -63,15 +63,38 @@
  <template name="echo" description="echo a string" context="php" enabled="true">echo "${string}";
   ${cursor}</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 bgcolor="#FFFFFF" text="#000000" link="#FF9966" vlink="#FF9966" alink="#FFCC99"&gt;
-  ${cursor}
-  &lt;/body&gt;
-  &lt;/html&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;/head&gt;
+&lt;body bgcolor="#FFFFFF" text="#000000" link="#FF9966" vlink="#FF9966" alink="#FFCC99"&gt;
+${cursor}
+&lt;/body&gt;
+&lt;/html&gt;
   </template>  
   <template name="&lt;title" description="title" context="html" enabled="true">
   &lt;title&gt;${cursor}&lt;/title&gt;
@@ -372,38 +395,75 @@
   <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="#00FFFF" description="Aqua (Color Code)" context="html" enabled="true">#00FFFF</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="#FF00FF" description="Fuchsia (Color Code)" context="html" enabled="true">#FF00FF</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="#808080" description="Gray (Color Code)" context="html" enabled="true">#808080</template>
   <template name="#008000" description="Green (Color Code)" context="html" enabled="true">#008000</template>
+  <template name="#00FF00" description="Lime (Color Code)" context="html" enabled="true">#00FF00</template>
   <template name="#FF00FF" description="Magenta (Color Code)" context="html" enabled="true">#FF00FF</template>
+  <template name="#800000" description="Maroon (Color Code)" context="html" enabled="true">#800000</template>
+  <template name="#000080" description="Navy (Color Code)" context="html" enabled="true">#000080</template>
+  <template name="#808000" description="Olive (Color Code)" context="html" enabled="true">#808000</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="#008080" description="Teal (Color Code)" context="html" enabled="true">#008080</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="Aqua" description="Aqua (Color Code)" context="html" enabled="true">#00FFFF</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="Fuchsia" description="Fuchsia (Color Code)" context="html" enabled="true">#FF00FF</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="Gray" description="Gray (Color Code)" context="html" enabled="true">#808080</template>
   <template name="Green" description="Green (Color Code)" context="html" enabled="true">#008000</template>
+  <template name="Lime" description="Lime (Color Code)" context="html" enabled="true">#00FF00</template>
   <template name="Magenta" description="Magenta (Color Code)" context="html" enabled="true">#FF00FF</template>
+  <template name="Maroon" description="Maroon (Color Code)" context="html" enabled="true">#800000</template>
+  <template name="Navy" description="Mavy (Color Code)" context="html" enabled="true">#000080</template>
+  <template name="Olive" description="Olive (Color Code)" context="html" enabled="true">#808000</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="Teal" description="Teal (Color Code)" context="html" enabled="true">#008080</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>
 
+  <template name="{" description="{* *}(Smarty comment)" context="html" enabled="true">{* ${cursor} *}</template>
+  <template name="{capture" description="{capture }{/capture}(Smarty)" context="html" enabled="true">{capture name=${name}}
+  ${cursor}
+  {/capture}
+  </template>
+  <template name="{include" description="{include file=&quot;&quot;}(Smarty)" context="html" enabled="true">{include file="${filename}.tpl"}
+  ${cursor}
+  </template>
+  <template name="{if" description="{if }{/if}(Smarty)" context="html" enabled="true">{if ${cursor}}
+  {/if}
+  </template>
+  <template name="{if" description="{if }{else}{/if}(Smarty)" context="html" enabled="true">{if ${cursor}}
+  {else}
+  {/if}
+  </template>
+  <template name="{section" description="{section }{/section}(Smarty)" context="html" enabled="true">{section name=${nameAttr} loop=${loopAttr}}
+  ${cursor}
+  {/section}
+  </template>
+  <template name="{assign" description="{assign var= value= }(Smarty)" context="html" enabled="true">{assign var="${name}" values="${value}"}${cursor}</template>
+  <template name="{cycle" description="{cycle values= }(Smarty)" context="html" enabled="true">{cycle values="${values}"}${cursor}</template>
+  <template name="{counter" description="{counter start= skip= print= }(Smarty)" context="html" enabled="true">{counter start=${startValue} skip=${skipValue} print=false}${cursor}</template>
+  <template name="{counter" description="{counter}(Smarty)" context="html" enabled="true">{counter}${cursor}</template>
+  
+   
 </templates>
\ No newline at end of file