Index: admin.xreg
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/conf/admin.xreg,v
retrieving revision 1.36
diff -u -r1.36 admin.xreg
--- admin.xreg	17 Apr 2003 16:08:53 -0000	1.36
+++ admin.xreg	2 May 2003 01:37:21 -0000
@@ -432,7 +432,7 @@
     parent="CustomizerVelocity" application="false">
     <security-ref parent="admin-only"/>
     <meta-info>
-      <title>Portlet</title>
+      <title>Skin</title>
       <description>Security Skin Maintenance for Jetspeed</description>
     </meta-info>
       <classname>org.apache.jetspeed.portal.portlets.CustomizerVelocityPortlet</classname>


Index: capability-combo.vm
===================================================================
RCS file: capability-combo.vm
diff -N capability-combo.vm
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ capability-combo.vm	2 May 2003 01:41:25 -0000
@@ -0,0 +1,47 @@
+#parse("include/capability.vm")
+
+<script>
+var capabilities = new Array;
+var populatedCapabilites = false;
+
+function populateCapabilites()
+{
+	#set($capCount = 0)
+	
+	#foreach($capability in $capabilities)
+		
+		#if(!$entry.CapabilityMap.contains($capability))
+			var option$capCount = new Option;
+			option${capCount}.text = "$capability";
+			option${capCount}.value = "$capability";
+			capabilities[$capCount] = option$capCount;
+			#set($capCount = $capCount + 1)
+		#end
+	#end
+	
+	populatedCapabilites = true;
+}
+
+function changeCapList(theForm)
+{
+	if(!populatedCapabilites)
+	{
+		populateCapabilites();
+	}
+	
+	var capElement = theForm.capability;
+	for(var i=0; i<capabilities.length; i++)
+	{
+		capElement.options[i] = capabilities[i];
+	}
+	
+	for(var j=capabilities.length; j<capElement.options.length; j++)
+	{
+		capElement.options[j] = null;
+	}
+}
+
+
+
+
+</script>
+

Index: mime-combo.vm
===================================================================
RCS file: mime-combo.vm
diff -N mime-combo.vm
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ mime-combo.vm	2 May 2003 01:41:25 -0000
@@ -0,0 +1,54 @@
+#parse("include/mimes.vm")
+
+<script>
+var mimeTypes = new Object;
+var populatedMimes = false;
+
+function populateMimes()
+{
+	#foreach($type in $types)
+		var $type.get(0)Var = new Array;
+		#foreach($subType in $type.get(1))
+			#set($varCount = $velocityCount - 1)
+			var option$varCount = new Option;
+			option${varCount}.value = "$subType";
+			option${varCount}.text = "$subType";
+			$type.get(0)Var[$varCount] = option${varCount};
+		#end
+		mimeTypes["$type.get(0)"] = $type.get(0)Var;
+	#end
+	
+	populatedMimes = true;
+}
+
+function changeMimeList(theForm)
+{
+	if(!populatedMimes)
+	{
+		populateMimes();
+	}
+	
+	var type = theForm.type.options[theForm.type.selectedIndex].value;
+	var optionsList = mimeTypes[type];
+	
+	var subTypeElement = theForm.subtype;
+	for(var i=0; i<optionsList.length; i++)
+	{
+		subTypeElement.options[i] = optionsList[i];
+	}
+	
+	for(var j=optionsList.length; j<subTypeElement.options.length; j++)
+	{
+		subTypeElement.options[j] = null;
+	}
+}
+
+function updateMimeType(theForm)
+{
+	var type = theForm.type.options[theForm.type.selectedIndex].value;
+	var subtype = theForm.subtype.options[theForm.subtype.selectedIndex].value;
+	
+	theForm.mime_type.value = type + "/" + subtype;
+}
+
+</script>
+

Index: skin-form.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/skin-form.vm,v
retrieving revision 1.2
diff -u -r1.2 skin-form.vm
--- skin-form.vm	25 Apr 2003 20:51:43 -0000	1.2
+++ skin-form.vm	2 May 2003 01:42:38 -0000
@@ -14,6 +14,19 @@
         </td>
       </tr>
       #end
+      #if($reason)
+      <tr>
+        <td colspan="2">
+          <table bgcolor="#ffffff">
+            <tr>
+              <td>
+                $reason
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      #end
 
       #if (($mode == "delete"))
       	<tr>


Index: portlet-form.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/portlet-form.vm,v
retrieving revision 1.2
diff -u -r1.2 portlet-form.vm
--- portlet-form.vm	22 Apr 2003 15:07:43 -0000	1.2
+++ portlet-form.vm	2 May 2003 01:42:54 -0000
@@ -12,6 +12,19 @@
         </td>
       </tr>
       #end
+      #if($reason)
+      <tr>
+        <td colspan="2">
+          <table bgcolor="#ffffff">
+            <tr>
+              <td>
+                $reason
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      #end
 </table>
 
       #if (($mode == "delete"))


Index: portlet-mediatype-form.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/portlet-mediatype-form.vm,v
retrieving revision 1.1
diff -u -r1.1 portlet-mediatype-form.vm
--- portlet-mediatype-form.vm	4 Mar 2003 17:39:42 -0000	1.1
+++ portlet-mediatype-form.vm	2 May 2003 01:43:04 -0000
@@ -45,9 +45,11 @@
                       <b><font face="$ui.sansSerifFonts">Media Type</font></b>
                   </td>
                   <td bgcolor="$!{skin.TitleBackgroundColor}">
-                      <b><font face="$ui.sansSerifFonts">
-                          <input type="text" name="media_type"/>
-                      </font></b>
+                      <select name="media_type">
+		              #foreach($mediaType in $media_types)
+		              	<option value="$mediaType">$mediaType</option>
+		              #end
+		              </select>
                   </td>
               </tr>
               <tr>


Index: security-form.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/security-form.vm,v
retrieving revision 1.1
diff -u -r1.1 security-form.vm
--- security-form.vm	15 Apr 2003 19:58:48 -0000	1.1
+++ security-form.vm	2 May 2003 01:43:13 -0000
@@ -12,6 +12,19 @@
         </td>
       </tr>
       #end
+      #if($reason)
+      <tr>
+        <td colspan="2">
+          <table bgcolor="#ffffff">
+            <tr>
+              <td>
+                $reason
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      #end
 </table>
 
       #if ($mode == "delete")
@@ -57,17 +70,16 @@
             </font>
           </td>
         </tr>
-        <!--Consider making text area-->
         <tr>
-	  <td bgcolor="$!{skin.TitleBackgroundColor}">
-	    <b><font face="$ui.sansSerifFonts">Description</font></b>
-	  </td>
-	  <td bgcolor="$!{skin.TitleBackgroundColor}">
-	    <font face="$ui.sansSerifFonts">
-	      <textarea rows="10" cols="50" size="50" name="description">$!data.user.getTemp("description")</textarea>
-	    </font>
-	  </td>
-	</tr>
+		  <td bgcolor="$!{skin.TitleBackgroundColor}">
+		    <b><font face="$ui.sansSerifFonts">Description</font></b>
+		  </td>
+		  <td bgcolor="$!{skin.TitleBackgroundColor}">
+		    <font face="$ui.sansSerifFonts">
+		      <textarea rows="10" cols="50" size="50" name="description">$!data.user.getTemp("description")</textarea>
+		    </font>
+		  </td>
+		</tr>
       </table>
       <table border="0"  cellspacing="0" cellpadding="5" width="30%">
       <tr>
@@ -95,17 +107,16 @@
 	            </font>
 	          </td>
 	        </tr>
-	        <!--Consider making text area-->
 	        <tr>
-		  <td bgcolor="$!{skin.TitleBackgroundColor}">
-		    <b><font face="$ui.sansSerifFonts">Description</font></b>
-		  </td>
-		  <td bgcolor="$!{skin.TitleBackgroundColor}">
-		    <font face="$ui.sansSerifFonts">
-		      <textarea rows="10" cols="50" size="50" name="description">$!entry.description</textarea>
-		    </font>
-		  </td>
-		</tr>
+			  <td bgcolor="$!{skin.TitleBackgroundColor}">
+			    <b><font face="$ui.sansSerifFonts">Description</font></b>
+			  </td>
+			  <td bgcolor="$!{skin.TitleBackgroundColor}">
+			    <font face="$ui.sansSerifFonts">
+			      <textarea rows="10" cols="50" size="50" name="description">$!entry.description</textarea>
+			    </font>
+			  </td>
+			</tr>
 	      </table>
 	      <table border="0"  cellspacing="0" cellpadding="5" width="30%">
 	      <tr>
@@ -252,15 +263,8 @@
 	      	</tr>
 	      	<tr>
 	      	  <td>Value</td>
-	      	  ##<td><input type="text" name="allow_value" value="$!data.parameters.getString("allow_value")"/></td>
-	      	  
 	      	  <td>
 	      	  	<select name="allow_value">
-	      	  	#*
-	      	  	#foreach($user in $users)
-	      	  		<option value="$user.name">$user.userName</option>
-	      	  	#end
-	      	  	*#
 	      	  	</select>
 	      	  </td>
 	      	</tr>

Index: client-form.vm
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/client-form.vm,v
retrieving revision 1.1
diff -u -r1.1 client-form.vm
--- client-form.vm	15 Apr 2003 20:43:02 -0000	1.1
+++ client-form.vm	2 May 2003 02:07:26 -0000
@@ -12,6 +12,19 @@
         </td>
       </tr>
       #end
+      #if($reason)
+      <tr>
+        <td colspan="2">
+          <table bgcolor="#ffffff">
+            <tr>
+              <td>
+                $reason
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      #end
 </table>
 
       #if (($mode == "delete"))
@@ -183,7 +196,7 @@
       	<table>
       	  #foreach($mimeType in $entry.MimetypeMap.Mimetypes)
       	  	<tr>
-      	  		<td><input type="checkbox" name="mimetype" value="$!mimeType"/></td>
+      	  		<td><input type="checkbox" name="mime_type" value="$!mimeType"/></td>
       	  		<td>$mimeType</td>
       	  	</tr>
       	  #end
@@ -195,96 +208,8 @@
       	</table>
       </form>
       #end
-      #parse("include/mimes.vm")
-      #parse("include/capability.vm")
-      <script>
-      	var mimeTypes = new Object;
-      	var capabilities = new Array;
-      	var populated = false;
-      	
-      	function populate()
-      	{
-      		#foreach($type in $types)
-      			var $type.get(0)Var = new Array;
-      			#foreach($subType in $type.get(1))
-      				#set($varCount = $velocityCount - 1)
-      				var option$varCount = new Option;
-      				option${varCount}.value = "$subType";
-      				option${varCount}.text = "$subType";
-      				$type.get(0)Var[$varCount] = option${varCount};
-      			#end
-      			mimeTypes["$type.get(0)"] = $type.get(0)Var;
-      		#end
-      		
-      		#set($capCount = 0)
-      		
-      		#foreach($capability in $capabilities)
-      			
-      			#if(!$entry.CapabilityMap.contains($capability))
-				var option$capCount = new Option;
-				option${capCount}.text = "$capability";
-				option${capCount}.value = "$capability";
-				capabilities[$capCount] = option$capCount;
-				#set($capCount = $capCount + 1)
-      			#end
-      		#end
-      		
-      		populated = true;
-      	}
-      	
-      	function changeMimeList()
-      	{
-      		if(!populated)
-      		{
-      			//alert("populating");
-      			populate();
-      		}
-      		
-      		var type = document.AddMimeType.type.options[document.AddMimeType.type.selectedIndex].value;
-      		var optionsList = mimeTypes[type];
-      		
-      		var subTypeElement = document.AddMimeType.subtype;
-      		for(var i=0; i<optionsList.length; i++)
-      		{
-      			subTypeElement.options[i] = optionsList[i];
-      		}
-      		
-      		for(var j=optionsList.length; j<subTypeElement.options.length; j++)
-      		{
-      			subTypeElement.options[j] = null;
-      		}
-      	}
-      	
-      	function changeCapList()
-      	{
-      		if(!populated)
-      		{
-      			//alert("populating");
-      			populate();
-      		}
-      		
-      		var capElement = document.AddCapability.capability;
-      		for(var i=0; i<capabilities.length; i++)
-      		{
-      			capElement.options[i] = capabilities[i];
-      		}
-      		
-      		for(var j=capabilities.length; j<capElement.options.length; j++)
-      		{
-      			capElement.options[j] = null;
-      		}
-      	}
-      	
-      	function updateMimeType()
-      	{
-      		var type = document.AddMimeType.type.options[document.AddMimeType.type.selectedIndex].value;
-      		var subtype = document.AddMimeType.subtype.options[document.AddMimeType.subtype.selectedIndex].value;
-      		
-      		document.AddMimeType.mimetype.value = type + "/" + subtype;
-      	}
-      	
-      	
-      </script>
+      #parse("include/mime-combo.vm")
+      #parse("include/capability-combo.vm")
       
       <p>Please Note: The first mime type added will be the preferred mime type</p>
       <form name="AddMimeType" method="post" action="$jslink.getPaneByName("ClientForm").setAction("portlets.ClientUpdateAction")">
@@ -292,11 +217,11 @@
       	<input type="hidden" name="mode" value="update"/>
       	<table>
       	  <tr>
-      	  	<td colspan="2"><input size="50" type="text" name="mimetype" value="$!data.user.getTemp("mimetype")"/></td>
+      	  	<td colspan="2"><input size="50" type="text" name="mime_type" value="$!data.user.getTemp("mime_type")"/></td>
       	  </tr>
       	  <tr>
       	  	<td>
-      	  	<select name="type" onChange="changeMimeList(); updateMimeType(); return true;">
+      	  	<select name="type" onChange="changeMimeList(document.AddMimeType); updateMimeType(document.AddMimeType); return true;">
       	  		<option value="text">text</option>
       	  		<option value="multipart">multipart</option>
       	  		<option value="message">message</option>
@@ -308,7 +233,7 @@
       	  	</select>
       	  	</td>
       	  	<td>
-      	  	<select name="subtype" onChange="updateMimeType(); return true;"><script>document.AddMimeType.type.selectedIndex=0; changeMimeList(); updateMimeType();</script></select>
+      	  	<select name="subtype" onChange="updateMimeType(document.AddMimeType); return true;"><script>document.AddMimeType.type.selectedIndex=0; changeMimeList(document.AddMimeType); updateMimeType(document.AddMimeType);</script></select>
       	  	</td>
       	  </tr>
       	  <tr>
@@ -343,51 +268,10 @@
       	<input type="hidden" name="mode" value="update"/>
       	<table>
       	  <tr>
-      	  	##<td><input type="text" name="capability" value="$!data.user.getTemp("capability")"/></td>
       	  	<td>
       	  		<select multiple="true" name="capability">
       	  		<option value=""></option>
-      	  		<script>changeCapList(); </script>
-      	  		#*
-      	  		<option value="HTML_3_2">HTML_3_2</option>
-			<option value="HTML_4_0">HTML_4_0</option>
-			<option value="HTML_TABLE">HTML_TABLE</option>
-			<option value="HTML_NESTED_TABLE">HTML_NESTED_TABLE</option>
-			<option value="HTML_FORM">HTML_FORM</option>
-			<option value="HTML_FRAME">HTML_FRAME</option>
-			<option value="HTML_IMAGE">HTML_IMAGE</option>
-			<option value="HTML_JAVA">HTML_JAVA</option>
-			<option value="HTML_JAVA_1_0">HTML_JAVA_1_0</option>
-			<option value="HTML_JAVA_1_1">HTML_JAVA_1_1</option>
-			<option value="HTML_JAVA_JRE">HTML_JAVA_JRE</option>
-			<option value="HTML_JAVASCRIPT">HTML_JAVASCRIPT</option>
-			<option value="HTML_JAVASCRIPT_1_0">HTML_JAVASCRIPT_1_0</option>
-			<option value="HTML_JAVASCRIPT_1_1">HTML_JAVASCRIPT_1_1</option>
-			<option value="HTML_JAVASCRIPT_1_2">HTML_JAVASCRIPT_1_2</option>
-			<option value="HTML_ACTIVE_X">HTML_ACTIVE_X</option>
-			<option value="HTML_PLUGIN">HTML_PLUGIN</option>
-			<option value="HTML_CSS1">HTML_CSS1</option>
-			<option value="HTML_CSS2">HTML_CSS2</option>
-			<option value="HTML_CSSP">HTML_CSSP</option>
-			<option value="HTML_IFRAME">HTML_IFRAME</option>
-			<option value="HTML_LAYER">HTML_LAYER</option>
-			<option value="">-------------</option>
-			<option value="HTML_DOM_IE">HTML_DOM_IE</option>
-			<option value="HTML_DOM_NS4">HTML_DOM_NS4</option>
-			<option value="HTML_DOM_1">HTML_DOM_1</option>
-			<option value="HTML_DOM_2">HTML_DOM_2</option>
-			<option value="">-------------</option>
-			<option value="WML_1_0">WML_1_0</option>
-			<option value="WML_1_1">WML_1_1</option>
-			<option value="WML_TABLE">WML_TABLE</option>
-			<option value="">-------------</option>
-			<option value="XML_XSLT">XML_XSLT</option>
-			<option value="XML_XPATH">XML_XPATH</option>
-			<option value="XML_XINCLUDE">XML_XINCLUDE</option>
-			<option value="">-------------</option>
-			<option value="HTTP_1_1">HTTP_1_1</option>
-			<option value="HTTP_COOKIE">HTTP_COOKIE</option>
-			*#
+      	  		<script>changeCapList(document.AddCapability); </script>
       	  		</select>
       	  	</td>
       	  </tr>