Index: t3lib/class.t3lib_tsparser_ext.php
===================================================================
--- t3lib/class.t3lib_tsparser_ext.php	(revision 2914)
+++ t3lib/class.t3lib_tsparser_ext.php	(working copy)
@@ -1126,9 +1126,10 @@
 	 * @return	[type]		...
 	 */
 	function ext_printFields($theConstants,$category)	{
-			// This functions returns the HTML-code that creates the editor-layout of the module.
+		// This functions returns the HTML-code that creates the editor-layout of the module.
 		reset($theConstants);
 		$output="";
+
 		$subcat="";
 		if (is_array($this->categories[$category]))	{
 
@@ -1147,205 +1148,237 @@
 						$output.='</tr>';
 					}
 
-			//		if (substr($params["value"],0,2)!='{$')	{
-						$label=$GLOBALS["LANG"]->sL($params["label"]);
-						$label_parts = explode(":",$label,2);
-						if (count($label_parts)==2)	{
-							$head=trim($label_parts[0]);
-							$body=trim($label_parts[1]);
-						} else {
-							$head=trim($label_parts[0]);
-							$body="";
-						}
-						if (strlen($head)>35)	{
+					$label=$GLOBALS["LANG"]->sL($params["label"]);
+					$label_parts = explode(":",$label,2);
+					if (count($label_parts)==2)	{
+						$head=trim($label_parts[0]);
+						$body=trim($label_parts[1]);
+					} else {
+						$head=trim($label_parts[0]);
+						$body="";
+					}
+					if (strlen($head)>35)	{
 							if (!$body) {$body=$head;}
 							$head=t3lib_div::fixed_lgd_cs($head,35);
 						}
-						$typeDat=$this->ext_getTypeData($params["type"]);
-						$checked="";
-						$p_field="";
-						$raname = substr(md5($params["name"]),0,10);
-						$aname="'".$raname."'";
-						if ($this->ext_dontCheckIssetValues || isset($this->objReg[$params["name"]]))	{
-							$checked=" checked";
-							list($fN,$fV,$params)=$this->ext_fNandV($params);
+					$typeDat=$this->ext_getTypeData($params["type"]);
+					$checked="";
+					$p_field="";
+					$raname = substr(md5($params["name"]),0,10);
+					$aname="'".$raname."'";
 
-							switch($typeDat["type"])	{
-								case "int":
-								case "int+":
-									$p_field='<input id="'.$fN.'" type="text" name="'.$fN.'" value="'.$fV.'"'.$GLOBALS["TBE_TEMPLATE"]->formWidth(5).' onChange="uFormUrl('.$aname.')">';
-									if ($typeDat["paramstr"])	{
-										$p_field.=' Range: '.$typeDat["paramstr"];
-									} elseif ($typeDat["type"]=="int+") {
-										$p_field.=' Range: 0 - ';
+					list($fN,$fV,$params)=$this->ext_fNandV($params);
+
+					switch($typeDat["type"])	{
+							case "int":
+							case "int+":
+								$p_field='<input id="'.$fN.'" type="text" name="'.$fN.'" value="'.$fV.'"'.$GLOBALS["TBE_TEMPLATE"]->formWidth(5).' onChange="uFormUrl('.$aname.')">';
+								if ($typeDat["paramstr"])	{
+									$p_field.=' Range: '.$typeDat["paramstr"];
+								} elseif ($typeDat["type"]=="int+") {
+									$p_field.=' Range: 0 - ';
+								} else {
+									$p_field.=' (Integer)';
+								}
+							break;
+							case "color":
+								$colorNames=explode(",",",".$this->HTMLcolorList);
+								$p_field="";
+								while(list(,$val)=each($colorNames))	{
+									$sel="";
+									if ($val==strtolower($params["value"]))	{$sel=" selected";}
+									$p_field.='<option value="'.htmlspecialchars($val).'"'.$sel.'>'.$val.'</option>';
+								}
+								$p_field='<select id="'.$fN.'" name="C'.$fN.'" onChange="document.'.$this->ext_CEformName.'[\''.$fN.'\'].value=this.options[this.selectedIndex].value; uFormUrl('.$aname.');">'.$p_field.'</select>';
+
+								$p_field.='<input type="text" name="'.$fN.'" value="'.$fV.'"'.$GLOBALS["TBE_TEMPLATE"]->formWidth(7).' onChange="uFormUrl('.$aname.')">';
+							break;
+							case "wrap":
+								$wArr = explode("|",$fV);
+								$p_field='<input type="text" id="'.$fN.'" name="'.$fN.'" value="'.$wArr[0].'"'.$GLOBALS["TBE_TEMPLATE"]->formWidth(29).' onChange="uFormUrl('.$aname.')">';
+								$p_field.=' | ';
+								$p_field.='<input type="text" name="W'.$fN.'" value="'.$wArr[1].'"'.$GLOBALS["TBE_TEMPLATE"]->formWidth(15).' onChange="uFormUrl('.$aname.')">';
+							break;
+							case "offset":
+								$wArr = explode(",",$fV);
+								$labels = t3lib_div::trimExplode(",",$typeDat["paramstr"]);
+								$p_field=($labels[0]?$labels[0]:"x").':<input type="text" name="'.$fN.'" value="'.$wArr[0].'"'.$GLOBALS["TBE_TEMPLATE"]->formWidth(4).' onChange="uFormUrl('.$aname.')">';
+								$p_field.=' , ';
+								$p_field.=($labels[1]?$labels[1]:"y").':<input type="text" name="W'.$fN.'" value="'.$wArr[1].'"'.$GLOBALS["TBE_TEMPLATE"]->formWidth(4).' onChange="uFormUrl('.$aname.')">';
+								for ($aa=2;$aa<count($labels);$aa++)	{
+									if ($labels[$aa])	{
+										$p_field.=' , '.$labels[$aa].':<input type="text" name="W'.$aa.$fN.'" value="'.$wArr[$aa].'"'.$GLOBALS["TBE_TEMPLATE"]->formWidth(4).' onChange="uFormUrl('.$aname.')">';
 									} else {
-										$p_field.=' (Integer)';
+										$p_field.='<input type="hidden" name="W'.$aa.$fN.'" value="'.$wArr[$aa].'">';
 									}
-								break;
-								case "color":
-									$colorNames=explode(",",",".$this->HTMLcolorList);
+								}
+							break;
+							case "options":
+								if (is_array($typeDat["params"]))	{
 									$p_field="";
-									while(list(,$val)=each($colorNames))	{
+									while(list(,$val)=each($typeDat["params"]))	{
+										$vParts = explode("=",$val,2);
+										$label = $vParts[0];
+										$val = isset($vParts[1]) ? $vParts[1] : $vParts[0];
+
+										// option tag:
 										$sel="";
-										if ($val==strtolower($params["value"]))	{$sel=" selected";}
-										$p_field.='<option value="'.htmlspecialchars($val).'"'.$sel.'>'.$val.'</option>';
-									}
-									$p_field='<select id="'.$fN.'" name="C'.$fN.'" onChange="document.'.$this->ext_CEformName.'[\''.$fN.'\'].value=this.options[this.selectedIndex].value; uFormUrl('.$aname.');">'.$p_field.'</select>';
-
-									$p_field.='<input type="text" name="'.$fN.'" value="'.$fV.'"'.$GLOBALS["TBE_TEMPLATE"]->formWidth(7).' onChange="uFormUrl('.$aname.')">';
-								break;
-								case "wrap":
-									$wArr = explode("|",$fV);
-									$p_field='<input type="text" id="'.$fN.'" name="'.$fN.'" value="'.$wArr[0].'"'.$GLOBALS["TBE_TEMPLATE"]->formWidth(29).' onChange="uFormUrl('.$aname.')">';
-									$p_field.=' | ';
-									$p_field.='<input type="text" name="W'.$fN.'" value="'.$wArr[1].'"'.$GLOBALS["TBE_TEMPLATE"]->formWidth(15).' onChange="uFormUrl('.$aname.')">';
-								break;
-								case "offset":
-									$wArr = explode(",",$fV);
-									$labels = t3lib_div::trimExplode(",",$typeDat["paramstr"]);
-									$p_field=($labels[0]?$labels[0]:"x").':<input type="text" name="'.$fN.'" value="'.$wArr[0].'"'.$GLOBALS["TBE_TEMPLATE"]->formWidth(4).' onChange="uFormUrl('.$aname.')">';
-									$p_field.=' , ';
-									$p_field.=($labels[1]?$labels[1]:"y").':<input type="text" name="W'.$fN.'" value="'.$wArr[1].'"'.$GLOBALS["TBE_TEMPLATE"]->formWidth(4).' onChange="uFormUrl('.$aname.')">';
-									for ($aa=2;$aa<count($labels);$aa++)	{
-										if ($labels[$aa])	{
-											$p_field.=' , '.$labels[$aa].':<input type="text" name="W'.$aa.$fN.'" value="'.$wArr[$aa].'"'.$GLOBALS["TBE_TEMPLATE"]->formWidth(4).' onChange="uFormUrl('.$aname.')">';
-										} else {
-											$p_field.='<input type="hidden" name="W'.$aa.$fN.'" value="'.$wArr[$aa].'">';
+										if ($val==$params["value"])	{
+											$sel=" selected";
 										}
+										$p_field.='<option value="'.htmlspecialchars($val).'"'.$sel.'>'.$GLOBALS["LANG"]->sL($label).'</option>';
 									}
-								break;
-								case "options":
-									if (is_array($typeDat["params"]))	{
-										$p_field="";
-										while(list(,$val)=each($typeDat["params"]))	{
-											$vParts = explode("=",$val,2);
-											$label = $vParts[0];
-											$val = isset($vParts[1]) ? $vParts[1] : $vParts[0];
+									$p_field='<select id="'.$fN.'" name="'.$fN.'" onChange="uFormUrl('.$aname.')">'.$p_field.'</select>';
+								}
+							break;
+							case "boolean":
+								$p_field='<input type="Hidden" name="'.$fN.'" value="0">';
+								$sel=""; 
+								if ($fV)	{
+									$sel=" checked";
+								}
+								$p_field.='<input id="'.$fN.'" type="checkbox" name="'.$fN.'" value="'.($typeDat["paramstr"]?$typeDat["paramstr"]:1).'"'.$sel.' onClick="uFormUrl('.$aname.')">';
+							break;
+							case "comment":
+								$p_field='<input type="Hidden" name="'.$fN.'" value="#">';
+								$sel=""; 
+								if (!$fV)	{
+									$sel=" checked";
+								}
+								$p_field.='<input id="'.$fN.'" type="checkbox" name="'.$fN.'" value=""'.$sel.' onClick="uFormUrl('.$aname.')">';
+							break;
+							case "file":
+								$p_field='<option value=""></option>';
+								$theImage="";
+								$selectThisFile = $this->extractFromResources($this->setup["resources"],$params["value"]);
+								if ($params["value"] && !$selectThisFile)	{
+									if (in_array($params["value"],$this->dirResources))	{
+										$selectThisFile=$params["value"];
+									}
+								}
+								// extensionlist
+								$extList = $typeDat["paramstr"];
+								$p_field='<option value="">('.$extList.')</option>';
+								if ($extList=="IMAGE_EXT")	{
+									$extList = $GLOBALS["TYPO3_CONF_VARS"]["GFX"]["imagefile_ext"];
+								}
+								reset($this->rArr);
+								$onlineResourceFlag=$this->ext_defaultOnlineResourceFlag;
 
-												// option tag:
-											$sel="";
-											if ($val==$params["value"])	{$sel=" selected";}
-											$p_field.='<option value="'.htmlspecialchars($val).'"'.$sel.'>'.$GLOBALS["LANG"]->sL($label).'</option>';
-										}
-										$p_field='<select id="'.$fN.'" name="'.$fN.'" onChange="uFormUrl('.$aname.')">'.$p_field.'</select>';
-									}
-								break;
-								case "boolean":
-									$p_field='<input type="Hidden" name="'.$fN.'" value="0">';
-									$sel=""; if ($fV)	{$sel=" checked";}
-									$p_field.='<input id="'.$fN.'" type="checkbox" name="'.$fN.'" value="'.($typeDat["paramstr"]?$typeDat["paramstr"]:1).'"'.$sel.' onClick="uFormUrl('.$aname.')">';
-								break;
-								case "comment":
-									$p_field='<input type="Hidden" name="'.$fN.'" value="#">';
-									$sel=""; if (!$fV)	{$sel=" checked";}
-									$p_field.='<input id="'.$fN.'" type="checkbox" name="'.$fN.'" value=""'.$sel.' onClick="uFormUrl('.$aname.')">';
-								break;
-								case "file":
-									$p_field='<option value=""></option>';
-//									debug($params["value"]);
-									$theImage="";
-//									if ($this->)	{
-										$selectThisFile = $this->extractFromResources($this->setup["resources"],$params["value"]);
-										if ($params["value"] && !$selectThisFile)	{
-											if (in_array($params["value"],$this->dirResources))	{
-												$selectThisFile=$params["value"];
+								while(list($c,$val)=each($this->rArr))	{
+									$val=trim($val);
+									$fI=t3lib_div::split_fileref($val);
+									if ($val && (!$extList || t3lib_div::inList($extList,$fI["fileext"])))	{
+										if ($onlineResourceFlag<=0 && substr($fI["path"],0,10)=="fileadmin/")	{
+											if ($onlineResourceFlag<0)	{
+												$p_field.='<option value=""></option>';
 											}
+											$p_field.='<option value="">__'.$fI["path"].'__:</option>';
+											$onlineResourceFlag=1;
 										}
-//										debug($selectThisFile);
-											// extensionlist
-										$extList = $typeDat["paramstr"];
-										$p_field='<option value="">('.$extList.')</option>';
-										if ($extList=="IMAGE_EXT")	{
-											$extList = $GLOBALS["TYPO3_CONF_VARS"]["GFX"]["imagefile_ext"];
-										}
-										reset($this->rArr);
-										$onlineResourceFlag=$this->ext_defaultOnlineResourceFlag;
+										$dims=$this->resourceDimensions[$val];
+										$sel="";
 
-										while(list($c,$val)=each($this->rArr))	{
-											$val=trim($val);
-											$fI=t3lib_div::split_fileref($val);
-//											debug($fI);
-											if ($val && (!$extList || t3lib_div::inList($extList,$fI["fileext"])))	{
-												if ($onlineResourceFlag<=0 && substr($fI["path"],0,10)=="fileadmin/")	{
-													if ($onlineResourceFlag<0)	{
-														$p_field.='<option value=""></option>';
-													}
-													$p_field.='<option value="">__'.$fI["path"].'__:</option>';
-													$onlineResourceFlag=1;
-												}
-												$dims=$this->resourceDimensions[$val];
-												$sel="";
-
-													// Check if $params["value"] is in the list of resources.
-												if ($selectThisFile && $selectThisFile==$val)	{
-													$sel=" selected";
-													if ($onlineResourceFlag<=0)	{
-														$theImage=t3lib_BEfunc::thumbCode(array("resources"=>$selectThisFile),"sys_template","resources",$GLOBALS["BACK_PATH"],"");
-													} else {
-														$theImage=t3lib_BEfunc::thumbCode(array("resources"=>$fI["file"]),"sys_template","resources",$GLOBALS["BACK_PATH"],"",$fI["path"]);
-													}
-												}
-
-												if ($onlineResourceFlag<=0)	{
-													$onlineResourceFlag--;
-														// Value is set with a *
-													$val = $this->ext_setStar($val);
-													$p_field.='<option value="'.htmlspecialchars($val).'"'.$sel.'>'.$val.$dims.'</option>';
-												} else {
-													$p_field.='<option value="'.htmlspecialchars($val).'"'.$sel.'>'.$fI["file"].$dims.'</option>';
-												}
+										// Check if $params["value"] is in the list of resources.
+										if ($selectThisFile && $selectThisFile==$val)	{
+											$sel=" selected";
+											if ($onlineResourceFlag<=0)	{
+												$theImage=t3lib_BEfunc::thumbCode(array("resources"=>$selectThisFile),"sys_template","resources",$GLOBALS["BACK_PATH"],"");
+											} else {
+												$theImage=t3lib_BEfunc::thumbCode(array("resources"=>$fI["file"]),"sys_template","resources",$GLOBALS["BACK_PATH"],"",$fI["path"]);
 											}
 										}
-										if (trim($params["value"]) && !$selectThisFile)	{
-											$val = $params["value"];
-											$p_field.='<option value=""></option>';
-											$p_field.='<option value="'.htmlspecialchars($val).'" selected>'.$val.'</option>';
-										}
-	//								}
-									$p_field='<select id="'.$fN.'" name="'.$fN.'" onChange="uFormUrl('.$aname.')">'.$p_field.'</select>';
-									$p_field.=$theImage;
 
-									if (!$this->ext_noCEUploadAndCopying)	{
-											// Copy a resource
-										$copyFile = $this->extractFromResources($this->setup["resources"],$params["value"]);
-										if (!$copyFile)	{
-											if ($params["value"])	{
-												$copyFile=PATH_site.$this->ext_detectAndFixExtensionPrefix($params["value"]);
-											}
+										if ($onlineResourceFlag<=0)	{
+											$onlineResourceFlag--;
+											// Value is set with a *
+											$val = $this->ext_setStar($val);
+											$p_field.='<option value="'.htmlspecialchars($val).'"'.$sel.'>'.$val.$dims.'</option>';
 										} else {
-	//										$copyFile=PATH_site."uploads/tf/".$copyFile;
-											$copyFile="";
+											$p_field.='<option value="'.htmlspecialchars($val).'"'.$sel.'>'.$fI["file"].$dims.'</option>';
 										}
-#debug($copyFile);
-										if ($copyFile && @is_file($copyFile))	{
-											$p_field.='<img src="clear.gif" width="20" height="1" alt="" /><img'.t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'],'gfx/clip_copy.gif','width="12" height="12"').' border="0" alt="" /><input type="Checkbox" name="_copyResource['.$params["name"].']" value="'.htmlspecialchars($copyFile).'" onClick="uFormUrl('.$aname.');if (this.checked) {alert(unescape(\''.rawurlencode(sprintf("This will make a copy of the current file, '%s'. Do you really want that?",$params["value"])).'\'));}">';
+									}
+								}
+
+								if (trim($params["value"]) && !$selectThisFile)	{
+									$val = $params["value"];
+									$p_field.='<option value=""></option>';
+									$p_field.='<option value="'.htmlspecialchars($val).'" selected>'.$val.'</option>';
+								}
+
+								$p_field='<select id="'.$fN.'" name="'.$fN.'" onChange="uFormUrl('.$aname.')">'.$p_field.'</select>';
+								$p_field.=$theImage;
+
+								if (!$this->ext_noCEUploadAndCopying)	{
+									// Copy a resource
+									$copyFile = $this->extractFromResources($this->setup["resources"],$params["value"]);
+									if (!$copyFile)	{
+										if ($params["value"])	{
+											$copyFile=PATH_site.$this->ext_detectAndFixExtensionPrefix($params["value"]);
 										}
-											// Upload?
-										$p_field.='<BR>';
-										$p_field.='<input id="'.$fN.'" type="file" name="upload_'.$fN.'"'.$GLOBALS["TBE_TEMPLATE"]->formWidth().' onChange="uFormUrl('.$aname.')" size="50" />';
+									} else {
+										$copyFile="";
 									}
-								break;
-								case 'user':
-									$userFunction       = $typeDat['paramstr'];
-									$userFunctionParams = array('fieldName' => $fN, 'fieldValue' => $fV);
-									$p_field            = t3lib_div::callUserFunction($userFunction, $userFunctionParams, $this, '');
-								break;
-								case 'small':
-								default:
-									$fwidth= $typeDat["type"]=="small" ? 10 : 46;
-									$p_field='<input id="'.$fN.'" type="text" name="'.$fN.'" value="'.$fV.'"'.$GLOBALS["TBE_TEMPLATE"]->formWidth($fwidth).' onChange="uFormUrl('.$aname.')">';
-								break;
+
+									if ($copyFile && @is_file($copyFile))	{
+										$p_field.='<img src="clear.gif" width="20" height="1" alt="" /><img'.t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'],'gfx/clip_copy.gif','width="12" height="12"').' border="0" alt="" /><input type="Checkbox" name="_copyResource['.$params["name"].']" value="'.htmlspecialchars($copyFile).'" onClick="uFormUrl('.$aname.');if (this.checked) {alert(unescape(\''.rawurlencode(sprintf("This will make a copy of the current file, '%s'. Do you really want that?",$params["value"])).'\'));}">';
+									}
+
+									// Upload?
+									$p_field.='<BR>';
+									$p_field.='<input id="'.$fN.'" type="file" name="upload_'.$fN.'"'.$GLOBALS["TBE_TEMPLATE"]->formWidth().' onChange="uFormUrl('.$aname.')" size="50" />';
+								}
+							break;
+							case 'user':
+								$userFunction       = $typeDat['paramstr'];
+								$userFunctionParams = array('fieldName' => $fN, 'fieldValue' => $fV);
+								$p_field            = t3lib_div::callUserFunction($userFunction, $userFunctionParams, $this, '');
+							break;
+							case 'small':
+							default:
+								$fwidth= $typeDat["type"]=="small" ? 10 : 46;
+								$p_field='<input id="'.$fN.'" type="text" name="'.$fN.'" value="'.$fV.'"'.$GLOBALS["TBE_TEMPLATE"]->formWidth($fwidth).' onChange="uFormUrl('.$aname.')">';
+							break;
+						}
+						
+						/* Start Jeff Patch */
+						
+						$userTyposcriptID = 'userTS-'.$params['name'];
+						$defaultTyposcriptID = 'defaultTS-'.$params['name'];
+						$checkboxName = 'check['.$params['name'].']';
+						$checkboxID = $checkboxName;
+						
+						$deleteIconHTML = '<img '.t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'], 'gfx/garbage.gif').' alt="Revert to default Constant" title="Revert to default value" onclick="$(\''.$userTyposcriptID.'\').hide(); $(\''.$defaultTyposcriptID.'\').show(); $(\''.$checkboxID.'\').setValue(\'\'); $(\''.$checkboxID.'\').disable();" />';
+						$editIconHTML 	= '<img '.t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'], 'gfx/edit2.gif').' alt="Edit this Constant" title="Edit this Constant" onclick="$(\''.$defaultTyposcriptID.'\').hide(); $(\''.$userTyposcriptID.'\').show(); $(\''.$checkboxID.'\').enable(); $(\''.$checkboxID.'\').setValue(\'checked\');" />';
+
+						if (!$this->ext_dontCheckIssetValues) {
+							
+							/* Set the default styling options */
+							if(isset($this->objReg[$params["name"]])) {
+								$checkboxValue = 'checked';
+								$userTyposcriptStyle = '';
+								$defaultTyposcriptStyle = 'style="display:none;"';
+							} else {
+								$checkboxValue = '';
+								$userTyposcriptStyle = 'style="display:none;"';
+								$defaultTyposcriptStyle = '';
 							}
+							
+							$p_check = '<input type="hidden" name="'.$checkboxName.'" id="'.$checkboxID.'" value="'.$checkboxValue.'"/>';
+							$p_field = $deleteIconHTML.$p_field;
+							$p_field = '<span id="'.$userTyposcriptID.'" '.$userTyposcriptStyle.'>'.$p_field.'</span>';
+							
 						}
-						if (!$this->ext_dontCheckIssetValues)	$p_field='<input type="Checkbox" name="check['.$params["name"].']" value="1"'.$checked.' onClick="uFormUrl('.$aname.')">'.$p_field;
 						if ($typeDat["type"]=="color" && substr($params["value"],0,2)!='{$')	{
-							$p_field='<table border=0 cellpadding=0 cellspacing=0><tr><td nowrap>'.$p_field.'</td><td>&nbsp;</td><td bgcolor="'.$params["value"].'"><img src="clear.gif" width=50 height=10></td></tr></table>';
+							$p_field = '<table border=0 cellpadding=0 cellspacing=0><tr><td nowrap>'.$p_field.'</td><td>&nbsp;</td><td bgcolor="'.$params["value"].'"><img src="clear.gif" width=50 height=10></td></tr></table>';
 						} else {
-							$p_field='<span class="nobr">'.$p_field.'</span><br />';
+							$p_field = '<span class="nobr">'.$p_field.'</span>';
 						}
 
 						$p_name = '<label for="'.$fN.'"><span class="typo3-dimmed">['.$params["name"].']</span></label><br />';
-						$p_dlabel='<span class="typo3-dimmed"><b>Default:</b> '.htmlspecialchars($params["default_value"]).'</span><BR>';
+						
+						$p_dlabel='<span id="'.$defaultTyposcriptID.'" '.$defaultTyposcriptStyle.'">'.$editIconHTML.htmlspecialchars($params["default_value"]).'</span><BR>';
+						
 						$p_label = '<label for="'.$fN.'"><b>'.htmlspecialchars($head).'</b></label>';
 						$p_descrip = $body ? htmlspecialchars($body)."<BR>" : "";
 
@@ -1354,11 +1387,11 @@
 						$output.='<td valign=top align="right">'.$p_name.'</td>';
 						$output.='</tr>';
 						$output.='<tr>';
-						$output.='<td colspan=2>'.$p_descrip.$p_field.$p_dlabel.'<br></td>';
+						$output.='<td colspan=2>'.$p_descrip.$p_check.$p_field.$p_dlabel.'<br></td>';
 						$output.='</tr>';
 			//		}
 				} else {
-					debug("Error. Constant did not exits. Should not happen.");
+					debug("Error. Constant did not exist. Should not happen.");
 				}
 			}
 			$output='<table border=0 cellpadding=0 cellspacing=0>'.$output.'</table>';
Index: typo3/sysext/tstemplate/ts/index.php
===================================================================
--- typo3/sysext/tstemplate/ts/index.php	(revision 2914)
+++ typo3/sysext/tstemplate/ts/index.php	(working copy)
@@ -99,7 +99,6 @@
 			$this->doc = t3lib_div::makeInstance("template");
 			$this->doc->backPath = $BACK_PATH;
 
-
 				// JavaScript
 			$this->doc->JScode = '
 		<script language="javascript" type="text/javascript">
@@ -147,27 +146,37 @@
 			$this->doc->getContextMenuCode();
 
 
-			$headerSection = $this->doc->getHeader("pages",$pageinfo,$pageinfo["_thePath"]).'<br>'.
-				$LANG->sL("LLL:EXT:lang/locallang_core.php:labels.path").': '.
+			$headerSection = $this->doc->getHeader("pages",$pageinfo,$pageinfo["_thePath"]);
+			$pagePath = $LANG->sL("LLL:EXT:lang/locallang_core.php:labels.path").': '.
 				'<span title="'.htmlspecialchars($pageinfo['_thePathFull']).'">'.htmlspecialchars(t3lib_div::fixed_lgd_cs($pageinfo['_thePath'],-50)).'</span>';
 
 				// Draw the header.
 			$this->doc->form='<form action="index.php?id='.$this->id.'" method="post" enctype="'.$GLOBALS["TYPO3_CONF_VARS"]["SYS"]["form_enctype"].'" name="editForm">';
 			$this->content.=$this->doc->startPage("Template Tools");
-			$this->content.=$this->doc->header("Template Tools");
-			$this->content.=$this->doc->spacer(5);
-			$this->content.=$this->doc->section('',$this->doc->funcMenu($headerSection,t3lib_BEfunc::getFuncMenu($this->id,"SET[function]",$this->MOD_SETTINGS["function"],$this->MOD_MENU["function"])));
+			//$this->content.=$this->doc->header("Template Tools");
+			
+			$this->content .= '<div id="typo3-docheader">';
+			$this->content .= '	<div id="typo3-docheader-row1">';
+			$this->content .= '		<div class="buttonsleft">'.$headerSection.'</div>';
+			$this->content .= '		<div class="buttonsright">'.t3lib_BEfunc::getFuncMenu($this->id,"SET[function]",$this->MOD_SETTINGS["function"],$this->MOD_MENU["function"]).'</div>';
+			$this->content .= '	</div>';
+			$this->content .= '	<div id="typo3-docheader-row2">';
+			$this->content .= '	<div class="pagepath">'.$pagePath.'</div>';
+			$this->content .= '	</div>';
+			$this->content .= '</div>';
 
+			$this->content .= '<div id="typo3-docbody">';
 
 			$this->extObjContent();
 
-
-
 			// ShortCut
 			if ($BE_USER->mayMakeShortcut())	{
 				$this->content.=$this->doc->spacer(20).$this->doc->section('',$this->doc->makeShortcutIcon("id,e,sObj,template","function,ts_browser_type,constant_editor_cat",$this->MCONF["name"]));
 			}
-			$this->content.=$this->doc->spacer(10);
+			//$this->content.=$this->doc->spacer(10);
+			
+			$this->content .= "</div>";
+			
 		} else {
 				// If no access or if ID == zero
 
@@ -176,7 +185,7 @@
 
 			$this->content.=$this->doc->startPage("Template Tools");
 			$this->content.=$this->doc->header("Template Tools");
-			$this->content.=$this->doc->spacer(5);
+			//$this->content.=$this->doc->spacer(5);
 
 
 				// Template pages:
Index: typo3/stylesheet.css
===================================================================
--- typo3/stylesheet.css	(revision 2914)
+++ typo3/stylesheet.css	(working copy)
@@ -126,7 +126,7 @@
 	background-color: #9BA1A8;
 }
 
-body#typo3-alt-doc-php { padding: 0; margin: 0; overflow: hidden; height: 100%; }
+body#typo3-alt-doc-php, body#ext-tstemplate-ts-index-php { padding: 0; margin: 0; overflow: hidden; height: 100%; }
 
 
 
Index: typo3/mod/tools/em/class.em_index.php
===================================================================
--- typo3/mod/tools/em/class.em_index.php	(revision 2914)
+++ typo3/mod/tools/em/class.em_index.php	(working copy)
@@ -407,7 +407,9 @@
 		$this->doc->docType = 'xhtml_trans';
 
 			// JavaScript
-		$this->doc->JScode = $this->doc->wrapScriptTags('
+		$this->doc->JScode = '<script type="text/javascript" src="'.$GLOBALS['BACK_PATH'].'contrib/prototype/prototype.js"></script>'."\n";
+		
+		$this->doc->JScode .= $this->doc->wrapScriptTags('
 			script_ended = 0;
 			function jumpToUrl(URL)	{	//
 				window.location.href = URL;