Index: trunk/admin/category/addcategory.php
===================================================================
diff -u -N -r4077 -r4107
--- trunk/admin/category/addcategory.php	(.../addcategory.php)	(revision 4077)
+++ trunk/admin/category/addcategory.php	(.../addcategory.php)	(revision 4107)
@@ -194,54 +194,69 @@
 	<tr <?php int_table_color(); ?>>
 		<td valign="top"><span id="prompt_auto_filename" class="text"><?php echo prompt_language('la_prompt_AutomaticDirectoryName'); ?></span></td>
 		<td>
-			<input type="checkbox" tabindex="5" name="auto_filename" id="auto_filename" class="text" value="1"<?php if( $c->Get('AutomaticFilename') == 1) echo ' checked'; ?> onchange="reflect_filename();">
+			<input type="checkbox" tabindex="3" name="auto_filename" id="auto_filename" class="text" value="1"<?php if( $c->Get('AutomaticFilename') == 1) echo ' checked'; ?> onchange="reflect_filename();">
 		</td>
 		<td class="text">&nbsp;</td>
 	</tr>
 	<tr <?php int_table_color(); ?>>
 		<td valign="top"><span ID="prompt_filename" class="text"><?php echo prompt_language('la_prompt_DirectoryName'); ?></span></td>
 		<td>
-			<input type="text" name="filename" id="filename" tabindex="1" class="text" size="63" value="<?php echo $c->Get('Filename'); ?>">
+			<input type="text" name="filename" id="filename" tabindex="4" class="text" size="63" value="<?php echo $c->Get('Filename'); ?>">
 		</td>
 		<td>&nbsp;</td>
 	</tr>
   
+	<tr <?php int_table_color(); ?>>
+		<td valign="top"><span ID="prompt_category_template" class="text"><?php echo prompt_language('la_fld_DefaultCategoryTemplate'); ?></span></td>
+		<td>
+			<input type="text" name="category_template" tabindex="5" class="text" size="40" value="<?php echo $c->Get('CategoryTemplate'); ?>">
+		</td>
+		<td>&nbsp;</td>
+	</tr>
+		<tr <?php int_table_color(); ?>>
+		<td valign="top"><span ID="prompt_item_template" class="text"><?php echo prompt_language('la_fld_DefaultItemTemplate'); ?></span></td>
+		<td>
+			<input type="text" name="item_template" tabindex="6" class="text" size="40" value="<?php echo $c->Get('ItemTemplate'); ?>">
+		</td>
+		<td>&nbsp;</td>
+	</tr>
+	
   <?php int_subsection_title(prompt_language("la_tab_Properties")); ?>
   <tr <?php int_table_color(); ?>>
     <td valign="top"><span id="prompt_status" class="text"><?php echo prompt_language("la_prompt_Status"); ?></span></td>
     <td>
-      <input type="radio" tabindex="3" name="status" class="text" value="1" <?php if($c->Get("Status") == 1) echo "checked"; ?>><?php echo prompt_language("la_val_Active"); ?>
-      <input type="radio" tabindex="3" name="status" class="text" value="2" <?php if($c->Get("Status") == 2) echo "checked"; ?>><?php echo prompt_language("la_val_Pending"); ?>
-      <input type="radio" tabindex="3" name="status" class="text" value="0" <?php if($c->Get("Status") == 0) echo "checked"; ?>><?php echo prompt_language("la_val_Disabled"); ?>
+      <input type="radio" tabindex="7" name="status" class="text" value="1" <?php if($c->Get("Status") == 1) echo "checked"; ?>><?php echo prompt_language("la_val_Active"); ?>
+      <input type="radio" tabindex="7" name="status" class="text" value="2" <?php if($c->Get("Status") == 2) echo "checked"; ?>><?php echo prompt_language("la_val_Pending"); ?>
+      <input type="radio" tabindex="7" name="status" class="text" value="0" <?php if($c->Get("Status") == 0) echo "checked"; ?>><?php echo prompt_language("la_val_Disabled"); ?>
      </td>
     <td class="text">&nbsp;</td>
   </tr>
   <tr <?php int_table_color(); ?>>
     <td valign="top"><span id="prompt_itemnew" class="text"><?php echo prompt_language("la_prompt_New"); ?></span></td>
     <td>
-       <input type="radio" tabindex="4" name="itemnew" class="text" value="2" <?php if($c->Get("NewItem") == 2) echo "checked"; ?>><?php echo prompt_language("la_val_Auto"); ?>
-       <input type="radio" tabindex="4" name="itemnew" class="text" value="1" <?php if($c->Get("NewItem") == 1) echo "checked"; ?>><?php echo prompt_language("la_val_Always"); ?>
-       <input type="radio" tabindex="4" name="itemnew" class="text" value="0" <?php if($c->Get("NewItem") == 0) echo "checked"; ?>><?php echo prompt_language("la_val_Never"); ?>
+       <input type="radio" tabindex="8" name="itemnew" class="text" value="2" <?php if($c->Get("NewItem") == 2) echo "checked"; ?>><?php echo prompt_language("la_val_Auto"); ?>
+       <input type="radio" tabindex="8" name="itemnew" class="text" value="1" <?php if($c->Get("NewItem") == 1) echo "checked"; ?>><?php echo prompt_language("la_val_Always"); ?>
+       <input type="radio" tabindex="8" name="itemnew" class="text" value="0" <?php if($c->Get("NewItem") == 0) echo "checked"; ?>><?php echo prompt_language("la_val_Never"); ?>
 
       </td>
     <td class="text">&nbsp;</td>
   </tr>
   <tr <?php int_table_color(); ?>>
    <td valign="top"><span id="prompt_cat_pick" class="text"><?php echo prompt_language("la_prompt_EditorsPick"); ?></span></td>
     <td>
-      <input type="checkbox" tabindex="5" name="cat_pick" class="text" value="1" <?php if($c->Get("EditorsPick") == 1) echo "checked"; ?>>
+      <input type="checkbox" tabindex="9" name="cat_pick" class="text" value="1" <?php if($c->Get("EditorsPick") == 1) echo "checked"; ?>>
     </td>
     <td class="text">&nbsp;</td>
   </tr>
   <TR <?php int_table_color(); ?> >
     <TD><span id="prompt_Priority" class="text"><?php echo prompt_language("la_prompt_Priority"); ?></span></TD>
-    <TD><input type=text SIZE="5" tabindex="6" NAME="Priority" VALUE="<?php echo $c->Get("Priority"); ?>"></TD>
+    <TD><input type=text SIZE="5" tabindex="10" NAME="Priority" VALUE="<?php echo $c->Get("Priority"); ?>"></TD>
     <TD>&nbsp;</TD>
   </TR>
   <tr <?php int_table_color(); ?>>
     <td valign="top" ID="prompt_cat_date" class="text"> <?php echo prompt_language("la_prompt_CreatedOn"); ?> </td>
     <td>
-      <input type="text" ValidationType="date,exists" tabindex="7" name="cat_date" id="cat_date_selector" datepickerIcon="../images/ddarrow.gif" class="text" size="20" value="<?php echo $c->parsetag("cat_date"); ?>">
+      <input type="text" ValidationType="date,exists" tabindex="11" name="cat_date" id="cat_date_selector" datepickerIcon="../images/ddarrow.gif" class="text" size="20" value="<?php echo $c->parsetag("cat_date"); ?>">
       <span class="small"><?php echo prompt_language("la_prompt_DateFormat"); ?></span>
       </td>
     <td>
@@ -252,18 +267,19 @@
   <tr <?php int_table_color(); ?>>
     <td valign="top"><span id="prompt_meta_keywords" class="text"><?php echo prompt_language("la_prompt_MetaKeywords"); ?></span></td>
     <td>
-      <input type="text" name="meta_keywords" tabindex="8" class="text" size="30" value="<?php echo $c->parsetag("cat_metakeywords"); ?>">
+      <input type="text" name="meta_keywords" tabindex="12" class="text" size="30" value="<?php echo $c->parsetag("cat_metakeywords"); ?>">
     </td>
     <td class="text">&nbsp;</td>
   </tr>
   <tr <?php int_table_color(); ?>>
     <td valign="top"><span id="prompt_meta_desc" class="text"><?php echo prompt_language("la_prompt_MetaDescription"); ?></span></td>
     <td>
-      <textarea name="meta_desc" tabindex="9" cols="60" rows="2" class="text"><?php echo inp_textarea_unescape($c->parsetag("cat_metadesc")); ?></textarea>
+      <textarea name="meta_desc" tabindex="13" cols="60" rows="2" class="text"><?php echo inp_textarea_unescape($c->parsetag("cat_metadesc")); ?></textarea>
     </td>
     <td class="text">&nbsp;</td>
   </tr>
-<?php  
+<?php
+	  
 $CustomFieldUI = $objCustomFields->GetFieldUIList(TRUE);
 if($CustomFieldUI->NumItems()>0)
 {
@@ -274,6 +290,7 @@
   }
   $headings = $CustomFieldUI->GetHeadingList();
   //echo "<PRE>";print_r($objCustomFields); echo "</PRE>";
+  $tab_index = 14;
   for($i=0;$i<=count($headings);$i++)
   {
     $h = $headings[$i];
@@ -291,11 +308,11 @@
         	}
             print "<tr ".int_table_color_ret().">\n"; 
             print "  <td valign=\"top\" class=\"text\">".$f->GetPrompt()."</td>\n";
-            print "  <td nowrap>".$f->ItemFormElement()."</TD>";       
+            print "  <td nowrap>".$f->ItemFormElement($tab_index++)."</TD>";       
             if(is_object($f->NextItem))
             {
                 $n = $f->NextItem;
-                print "  <td>".$n->ItemFormElement()."</TD>";       
+                print "  <td>".$n->ItemFormElement($tab_index++)."</TD>";       
             }
             else
               print "  <td><span class=\"text\">&nbsp;</span></td>\n";