portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject cvs commit: jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view site-detail.jsp user-details.jsp metadata-detail.jsp portlet-detail.jsp pam-detail.jsp
Date Fri, 24 Sep 2004 22:21:15 GMT
ate         2004/09/24 15:21:15

  Modified:    applications/pam/src/webapp/WEB-INF/view site-detail.jsp
                        user-details.jsp metadata-detail.jsp
                        portlet-detail.jsp pam-detail.jsp
  Log:
  Changed all forms to use HTTP POST (method="post").
  Using HTTP GET (the default) will result losing the query string if defined in the form action.
  This is also specified in the Portlet Spec PLT.7.1:
    "portlet developers should not code forms using the HTTP GET method."
  
  Revision  Changes    Path
  1.8       +1 -1      jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/site-detail.jsp
  
  Index: site-detail.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/site-detail.jsp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- site-detail.jsp	24 Sep 2004 15:00:47 -0000	1.7
  +++ site-detail.jsp	24 Sep 2004 22:21:15 -0000	1.8
  @@ -98,7 +98,7 @@
   <c:if test="${currentTab.id == 'site_security'  && node != null}">
   		<portlet:actionURL var="edit_page_link" />
   
  -		<form action="<c:out value="${edit_page_link}"/>">
  +		<form action="<c:out value="${edit_page_link}"/>" method="post">
   			<c:if test="${folder != null}">
   				<input type="hidden" name="action_type" value="folder"/>
   			</c:if>
  
  
  
  1.8       +7 -7      jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/user-details.jsp
  
  Index: user-details.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/user-details.jsp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- user-details.jsp	20 Sep 2004 17:16:13 -0000	1.7
  +++ user-details.jsp	24 Sep 2004 22:21:15 -0000	1.8
  @@ -58,7 +58,7 @@
     <div id="attributes">	
     <portlet:actionURL var="edit_user_attr_link" />
     
  -	<form name="Edit_UserAttr_Form" action="<c:out value="${edit_user_attr_link}"/>">
  +	<form name="Edit_UserAttr_Form" action="<c:out value="${edit_user_attr_link}"/>" method="post">
   		<input type="hidden" name="portlet_action" value="security_user.edit_user_attribute"/>
   		
   		<table>
  @@ -86,7 +86,7 @@
   		<input type="submit" value="<fmt:message key="security.update"/>" onClick="this.form.portlet_action.value = 'security_user.update_user_attribute'"/>
   		<input type="submit" value="<fmt:message key="security.remove"/>" onClick="this.form.portlet_action.value = 'security_user.remove_user_attribute'"/>
   	</form>
  -	<form name="Add_UserAttr_Form" action="<c:out value="${edit_user_attr_link}"/>">
  +	<form name="Add_UserAttr_Form" action="<c:out value="${edit_user_attr_link}"/>" method="post">
   		<input type="hidden" name="portlet_action" value="security_user.add_user_attribute"/>
   		
   		<table>
  @@ -119,7 +119,7 @@
     <div id="Role">
     <portlet:actionURL var="edit_role_link" />
     
  -	<form name="Edit_Role_Form" action="<c:out value="${edit_role_link}"/>">
  +	<form name="Edit_Role_Form" action="<c:out value="${edit_role_link}"/>" method="post">
   		<input type="hidden" name="portlet_action" value="security_user.edit_role"/>		
   		<table>
   			<tr>
  @@ -139,7 +139,7 @@
   		</table>
   		<input type="submit" value="<fmt:message key="security.remove"/>" onClick="this.form.portlet_action.value = 'security_user.remove_user_role'"/>
       </form>
  -	<form name="Add_Role_Form" action="<c:out value="${edit_role_link}"/>">
  +	<form name="Add_Role_Form" action="<c:out value="${edit_role_link}"/>" method="post">
   		<input type="hidden" name="portlet_action" value="security_user.add_user_role"/>
   		
   		<table>
  @@ -165,7 +165,7 @@
     <div id="Group">
     <portlet:actionURL var="edit_group_link" />
     
  -	<form name="Edit_Group_Form" action="<c:out value="${edit_group_link}"/>">
  +	<form name="Edit_Group_Form" action="<c:out value="${edit_group_link}"/>" method="post">
   		<input type="hidden" name="portlet_action" value="security_user.edit_group"/>		
   		<table>
   			<tr>
  @@ -185,7 +185,7 @@
   		</table>
   		<input type="submit" value="<fmt:message key="security.remove"/>" onClick="this.form.portlet_action.value = 'security_user.remove_user_group'"/>
       </form>
  -	<form name="Add_Group_Form" action="<c:out value="${edit_group_link}"/>">
  +	<form name="Add_Group_Form" action="<c:out value="${edit_group_link}"/>" method="post">
   		<input type="hidden" name="portlet_action" value="security_user.add_user_group"/>
   		
   		<table>
  @@ -212,7 +212,7 @@
     <div id="Profile">
     <portlet:actionURL var="edit_role_link" />
     
  -	<form name="Edit_Group_Form" action="<c:out value="${edit_role_link}"/>">
  +	<form name="Edit_Group_Form" action="<c:out value="${edit_role_link}"/>" method="post">
   		<input type="hidden" name="portlet_action" value="security_user.update_user_rule"/>		
   		<table>
   			<tr>
  
  
  
  1.3       +1 -1      jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/metadata-detail.jsp
  
  Index: metadata-detail.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/metadata-detail.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- metadata-detail.jsp	9 Sep 2004 22:25:02 -0000	1.2
  +++ metadata-detail.jsp	24 Sep 2004 22:21:15 -0000	1.3
  @@ -1 +1 @@
  -<%--
Copyright 2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
    http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--%>
<form name="Edit_Metatdata_Form" action="<c:out value="${edit_metadata_link}"/>">
	<input type="hidden" name="portlet_action" value=""/>
	<table>
		<tr>
			<th>&nbsp;</th>
			<th><fmt:message key="pam.details.name"/></th>
			<th><fmt:message key="pam.details.locale"/></th>
			<th><fmt:message key="pam.details.value"/></th>
		</tr>
	<c:forEach var="field" items="${md.fields}">
		<tr>
			<td>
				<input type="checkbox" name="metadata_id" value="<c:out value="${field.id}"/>"/>
			</td>
			<td>	
				<c:out value="${field.name}"/>
			</td>
			<td align="center">
				<c:out value="${field.locale}"/> 
				
			</td>
			<td>
				<%--TODO:  value needs to escaped, or use textarea--%>
				<input type="text" name="<c:out value="${field.id}"/>:value" value="<c:out value="${field.value}"/>" size="50"/>
			</td>
		</tr>
	</c:forEach>
	</table>
			
	<input type="submit" value="<fmt:message key="pam.details.edit"/>" onClick="this.form.portlet_action.value = '<c:out value="${action_prefix}"/>edit_metadata'"/>
	<input type="submit" value="<fmt:message key="pam.details.remove"/>" onClick="this.form.portlet_action.value = '<c:out value="${action_prefix}"/>remove_metadata'"/>
</form>
		
<form action="<c:out value="${edit_metadata_link}"/>">
	<input type="hidden" name="portlet_action" value="<c:out value="${action_prefix}"/>add_metadata"/>
	<div>
		<table>
			<tr>
				<td>
					<span class="portlet-form-label"><fmt:message key="pam.details.name"/></span>
				</td>
				<td>
					<input type="text" name="name" value=""/>
				</td>
			</tr>
			<tr>
				<td>
					<span class="portlet-form-label"><fmt:message key="pam.details.value"/></span>
				</td>
				<td>
					<input type="text" name="value" value=""/>
				</td>
			</tr>
			<tr>
				<td>
					<span class="portlet-form-label"><fmt:message key="pam.details.locale"/></span>
				</td>
				<td>
					<input type="text" name="locale" value=""/>
				</td>
			</tr>
		</table>
	</div>
	<input type="submit" value="<fmt:message key="pam.details.add_metadata"/>"/>
</form>
  \ No newline at end of file
  +<%--
Copyright 2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
    http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--%>
<form name="Edit_Metatdata_Form" action="<c:out value="${edit_metadata_link}"/>" method="post">
	<input type="hidden" name="portlet_action" value=""/>
	<table>
		<tr>
			<th>&nbsp;</th>
			<th><fmt:message key="pam.details.name"/></th>
			<th><fmt:message key="pam.details.locale"/></th>
			<th><fmt:message key="pam.details.value"/></th>
		</tr>
	<c:forEach var="field" items="${md.fields}">
		<tr>
			<td>
				<input type="checkbox" name="metadata_id" value="<c:out value="${field.id}"/>"/>
			</td>
			<td>	
				<c:out value="${field.name}"/>
			</td>
			<td align="center">
				<c:out value="${field.locale}"/> 
				
			</td>
			<td>
				<%--TODO:  value needs to escaped, or use textarea--%>
				<input type="text" name="<c:out value="${field.id}"/>:value" value="<c:out value="${field.value}"/>" size="50"/>
			</td>
		</tr>
	</c:forEach>
	</table>
			
	<input type="submit" value="<fmt:message key="pam.details.edit"/>" onClick="this.form.portlet_action.value = '<c:out value="${action_prefix}"/>edit_metadata'"/>
	<input type="submit" value="<fmt:message key="pam.details.remove"/>" onClick="this.form.portlet_action.value = '<c:out value="${action_prefix}"/>remove_metadata'"/>
</form>
		
<form action="<c:out value="${edit_metadata_link}"/>" method="post">
	<input type="hidden" name="portlet_action" value="<c:out value="${action_prefix}"/>add_metadata"/>
	<div>
		<table>
			<tr>
				<td>
					<span class="portlet-form-label"><fmt:message key="pam.details.name"/></span>
				</td>
				<td>
					<input type="text" name="name" value=""/>
				</td>
			</tr>
			<tr>
				<td>
					<span class="portlet-form-label"><fmt:message key="pam.details.value"/></span>
				</td>
				<td>
					<input type="text" name="value" value=""/>
				</td>
			</tr>
			<tr>
				<td>
					<span class="portlet-form-label"><fmt:message key="pam.details.locale"/></span>
				</td>
				<td>
					<input type="text" name="locale" value=""/>
				</td>
			</tr>
		</table>
	</div>
	<input type="submit" value="<fmt:message key="pam.details.add_metadata"/>"/>
</form>
  \ No newline at end of file
  
  
  
  1.13      +1 -1      jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/portlet-detail.jsp
  
  Index: portlet-detail.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/portlet-detail.jsp,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- portlet-detail.jsp	23 Sep 2004 20:54:43 -0000	1.12
  +++ portlet-detail.jsp	24 Sep 2004 22:21:15 -0000	1.13
  @@ -1 +1 @@
  -<%--
Copyright 2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
    http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--%>
<c:set var="portlet_tabs" value="${requestScope.portlet_tabs}"/>

<c:set var="selectedPortletTab" value="${requestScope.selected_portlet_tab}"/>

<span class="portlet-section-header">Selected Portlet</span>
<c:out value="${selectedPDef.name}"/>
<div id="portlet_tabs">

	<c:set var="tab_items" value="${portlet_tabs}"/>
	<c:set var="currentTab" value="${selectedPortletTab}"/>
	<c:set var="url_param_name" value="selected_portlet_tab"/>
	<%@ include file="tabs.jsp"%>
</div>

<br />

<c:if test="${selectedPortletTab.id == 'pd_details'}">
	<portlet:actionURL var="edit_portlet_link" >
    </portlet:actionURL>
	
	<form action="<c:out value="${edit_portlet_link}"/>">
		<input type="hidden" name="portlet_action" value="portlet.edit_portlet"/>
	<table>
		<tr>
			<td>
				<fmt:message key="pam.details.expiration_cache"/>
			</td>
			<td>
				<c:out value="${selectedPDef.expirationCache}"/>
			</td>
		</tr>
		</tr>
			<td>
				<fmt:message key="pam.details.id"/>
			</td>
			<td>
				<c:out value="${selectedPDef.portletIdentifier}"/>
			</td>
		</tr>
		</tr>
			<td>
				<fmt:message key="pam.details.unique_name"/>
			</td>
			<td>
				<c:out value="${selectedPDef.uniqueName}"/>
			</td>
		</tr>
		</tr>
			<td>
				<fmt:message key="pam.details.preference_validator"/>
			</td>
			<td>
				<c:out value="${selectedPDef.preferenceValidatorClassname}"/>
			</td>
		</tr>
		</tr>
			<td>
				<fmt:message key="pam.details.class_name"/>
			</td>
			<td>
				<c:out value="${selectedPDef.className}"/>
			</td>
		</tr>
		<tr>
			<td>
				<fmt:message key="pam.details.display_name"/>
			</td>
			<td>
				<table>
					<%
						PortletDefinitionComposite portlet = (PortletDefinitionComposite)pageContext.findAttribute("selectedPDef");
						pageContext.setAttribute("displayNameSet", portlet.getDisplayNameSet());
					%>
					<c:forEach var="displayName" items="${displayNameSet.innerCollection}" varStatus="displayNameStatus">
						<tr>
							
							<td><c:out value="${displayName.locale}"/></td>
							<td><input type="text" name="display_name:<c:out value="${displayNameStatus.index}"/>" value="<c:out value="${displayName.displayName}"/>"/></td>
						</tr>
					</c:forEach>
				</table>
			</td>
		</tr>
	</table>
	
		<input type="submit" value="<fmt:message key="pam.details.edit_display_name"/>"/>
	</form>
	
	<form action="<c:out value="${edit_portlet_link}"/>">
		<input type="hidden" name="portlet_action" value="portlet.edit_portlet"/>
		<table>
			<tr>
				<td>
					<fmt:message key="pam.details.display_name"/>
				</td>
				<td>
					<input type="text" name="display_name" value=""/>
				</td>
				<td>
					<fmt:message key="pam.details.display_name.description"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.locale"/>
				</td>
				<td>
					<input type="text" name="locale" value="" size="2"/>
				</td>
				<td>
					<fmt:message key="pam.details.locale.description"/>
				</td>
			</tr>
		</table>
		<input type="submit" value="<fmt:message key="pam.details.add_display_name"/>"/>
	</form>
</c:if>

<c:if test="${selectedPortletTab.id == 'pd_metadata'}">
	<div id="portlet_metadata">
			
		<c:set var="md" value="${selectedPDef.metadata}"/>
		<c:set var="action_prefix" value="portlet."/>
		<portlet:actionURL var="edit_metadata_link" >			
		</portlet:actionURL>
		
		<%@ include file="metadata-detail.jsp" %>
	</div>
</c:if>

<c:if test="${selectedPortletTab.id == 'pd_preferences'}">
	<c:set var="prefSet" value="${selectedPDef.preferenceSet}"/>
	<%
		PreferenceSetComposite comp = (PreferenceSetComposite)pageContext.findAttribute("prefSet");
		Iterator prefIter = comp.iterator();
		pageContext.setAttribute("prefIter", prefIter);
	%>
	
	<portlet:actionURL var="edit_preferenece_link" >
    </portlet:actionURL>
	
	<form action="<c:out value="${edit_preferenece_link}"/>">
		<input type="hidden" name="portlet_action" value=""/>
		<table border="1">
			<tr>
				<th>&nbsp;</th>
				<th><fmt:message key="pam.details.name"/></th>
				<th><fmt:message key="pam.details.value"/></th>
			</tr>
			<tr>
				<td colspan="3">&nbsp;</td>
			</td>
		<c:forEach var="pref" items="${prefIter}">
			<tr>
				<td>
					<input type="checkbox" name="pref_remove_id" value="<c:out value="${pref.name}"/>"/>
				</td>
				<td>
					<c:out value="${pref.name}"/>
					<input type="hidden" name="pref_edit_id" value="<c:out value="${pref.name}"/>"/>
				</td>
				<td>
					<table>
					<c:forEach var="value" items="${pref.values}" varStatus="status">
						<tr>
							<td>
								<input type="text" name="<c:out value="${pref.name}"/>:<c:out value="${status.index}"/>" value="<c:out value="${value}"/>"/>
							</td>
						</tr>
					</c:forEach>
					</table>
				</tr>
			</tr>
		</c:forEach>
		</table>
		
		<input type="submit" value="<fmt:message key="pam.details.edit"/>" onClick="this.form.portlet_action.value = 'portlet.edit_preference'"/>
		<input type="submit" value="<fmt:message key="pam.details.remove"/>" onClick="this.form.portlet_action.value = 'portlet.remove_preference'"/>
	</form>
	
	<hr />
	
	
	<form action="<c:out value="${edit_preferenece_link}"/>">
		<input type="hidden" name="portlet_action" value="portlet.add_preference"/>
		<table>
			<tr>
				<td>
					<fmt:message key="pam.details.name"/>
				</td>
				<td>
					<input type="text" name="name"/>
				</td>
				<%--TODO add combo box of existing keys--%>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.value"/>
				</td>
				<td>
					<input type="text" name="value"/>
				</td>
			</tr>
			<%--
			<tr>
				<td>
					<fmt:message key="pam.details.type"/>
				</td>
				<td>
					<select>
						<option value="string">String</option>
						<option value="int">Int</option>
					</select>
				</td>
			</tr>
			--%>
		</table>
		<input type="submit" value="<fmt:message key="pam.details.add_preference"/>"/>
	</form>
</c:if>

<c:if test="${selectedPortletTab.id == 'pd_languages'}">
	<c:set var="langSet" value="${selectedPDef.languageSet}"/>
	
	<portlet:actionURL var="edit_language_link" >
    </portlet:actionURL>
	
	<form action="<c:out value="${edit_language_link}"/>">
		<input type="hidden" name="portlet_action" value=""/>
	<table border="1">
		<tr>
			<th>&nbsp;</th>
			<th><fmt:message key="pam.details.title"/></th>
			<th><fmt:message key="pam.details.short_title"/></th>
			<th><fmt:message key="pam.details.keyword"/></th>
			<th><fmt:message key="pam.details.locale"/></th>
		</tr>
	<c:forEach var="lang" items="${langSet.innerCollection}" varStatus="status">
		<tr>
			<td>
				<input type="checkbox" name="language_remove_id" value="<c:out value="${status.index}"/>"/>
				<input type="hidden" name="language_edit_id" value="<c:out value="${status.index}"/>"/>
			</td>
			<td>
				<input type="text" name="title:<c:out value="${status.index}"/>" value="<c:out value="${lang.title}"/>"/>
			</td>
			<td>
				<input type="text" name="short_title:<c:out value="${status.index}"/>" value="<c:out value="${lang.shortTitle}"/>"/>
			</td>
			<td>
				<table>
				<c:forEach var="keyword" items="${lang.keywords}" varStatus="keywordStatus">
					<tr>
						<td>
							<input type="text" name="keyword:<c:out value="${status.index}"/>:<c:out value="${keywordStatus.index}"/>" value="<c:out value="${keyword}"/>"/>
						</td>
					</tr>
				</c:forEach>
				</table>
				<%--
				<input type="text" name="keyword:<c:out value="${status.index}"/>" value="<c:forEach var="keyword" items="${lang.keywords}" varStatus="keywordStatus"><c:out value="${keyword}"/>,</c:forEach>"/>
				--%>
			</td>
			<td>
				<c:out value="${lang.locale}"/>
			</td>
		</tr>
	</c:forEach>
	</table>
	
		<input type="submit" value="<fmt:message key="pam.details.edit"/>" onClick="this.form.portlet_action.value = 'portlet.edit_language'"/>
		<input type="submit" value="<fmt:message key="pam.details.remove"/>" onClick="this.form.portlet_action.value = 'portlet.remove_language'"/>
	</form>
	
	<form action="<c:out value="${edit_language_link}"/>">
		<input type="hidden" name="portlet_action" value="portlet.add_language"/>
		
		<table>
			<tr>
				<td>
					<fmt:message key="pam.details.title"/>
				</td>
				<td>
					<input type="text" name="title" value=""/>
				</td>
				<td>
					<fmt:message key="pam.details.title.description"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.short_title"/>
				</td>
				<td>
					<input type="text" name="short_title" value=""/>
				</td>
				<td>
					<fmt:message key="pam.details.short_title.description"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.keyword"/>
				</td>
				<td>
					<input type="text" name="keyword" value=""/>
				</td>
				<td>
					<fmt:message key="pam.details.keyword.description"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.locale"/>
				</td>
				<td>
					<input type="text" name="locale" value="" size="2"/>
				</td>
				<td>
					<fmt:message key="pam.details.locale.description"/>
				</td>
			</tr>
		</table>
		
		<input type="submit" value="<fmt:message key="pam.details.add_language"/>"/>
	</form>
</c:if>

<c:if test="${selectedPortletTab.id == 'pd_parameters'}">
	<c:set var="paramSet" value="${selectedPDef.initParameterSet}"/>
	
	<portlet:actionURL var="edit_parameter_link" >
    </portlet:actionURL>
	
	<%--
		TODO:  if needed, place iterator into page context
		see prefs section
	--%>
	
	<form action="<c:out value="${edit_parameter_link}"/>">
		<input type="hidden" name="portlet_action" value=""/>
	
	<table border="1">
		<tr>
			<th>&nbsp;</th>
			<th><fmt:message key="pam.details.name"/></th>
			<th><fmt:message key="pam.details.value"/></th>
			<th><fmt:message key="pam.details.locale"/> / <fmt:message key="pam.details.description"/></th>
		</tr>
	<c:forEach var="theparam" items="${paramSet.innerCollection}">
		<tr>
			<td>
				<input type="checkbox" name="parameter_remove_id" value="<c:out value="${theparam.name}"/>" />
			</td>
			<td>
				<input type="hidden" name="parameter_edit_id" value="<c:out value="${theparam.name}"/>" />
				<c:out value="${theparam.name}"/>
			</td>
			<td>
				<input type="text" name="<c:out value="${theparam.name}"/>:value" value="<c:out value="${theparam.value}"/>"/>
			</td>
			<td>
				<%
					ParameterComposite param = (ParameterComposite)pageContext.findAttribute("theparam");
					pageContext.setAttribute("description_set", param.getDescriptionSet());
				%>
				<table>
				<c:forEach var="description" items="${description_set.innerCollection}" varStatus="descStatus">
					<tr>
						<td>
							<c:out value="${description.locale}"/>
						</td>
						<td>
							<input type="text" name="<c:out value="${theparam.name}"/>:description:<c:out value="${descStatus.index}"/>"
								value="<c:out value="${description.description}"/>"/>
						</td>
					</tr>
				</c:forEach>
				</table>
			</td>
		</tr>
	</c:forEach>
	</table>
	
		<input type="submit" value="<fmt:message key="pam.details.edit"/>" onClick="this.form.portlet_action.value = 'portlet.edit_parameter'"/>
		<input type="submit" value="<fmt:message key="pam.details.remove"/>" onClick="this.form.portlet_action.value = 'portlet.remove_parameter'"/>
	
	</form>
	
	<form action="<c:out value="${edit_parameter_link}"/>">
		<input type="hidden" name="portlet_action" value="portlet.add_parameter"/>
		<table>
			<tr>
				<td>
					<fmt:message key="pam.details.name"/>
				</td>
				<td>
					<input type="text" name="name" value=""/>
				</td>
				<td>
					<fmt:message key="pam.details.name.description"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.value"/>
				</td>
				<td>
					<input type="text" name="value" value=""/>
				</td>
				<td>
					<fmt:message key="pam.details.value.description"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.description"/>
				</td>
				<td>
					<input type="text" name="description" value=""/>
				</td>
				<td>
					<fmt:message key="pam.details.description.description"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.locale"/>
				</td>
				<td>
					<input type="text" name="locale" value="" size="2"/>
				</td>
				<td>
					<fmt:message key="pam.details.locale.description"/>
				</td>
			</tr>
		</table>
		<input type="submit" value="<fmt:message key="pam.details.add_parameter"/>"/>
	</form>
	
</c:if>
<c:if test="${selectedPortletTab.id == 'pd_security'}">
	<c:set var="roleSet" value="${selectedPDef.initSecurityRoleRefSet}"/>
	
	<portlet:actionURL var="edit_security_link" >
    </portlet:actionURL>

	<c:if test="${! empty roleSet.innerCollection}">
	<form action="<c:out value="${edit_security_link}"/>">
		<input type="hidden" name="portlet_action" value=""/>	
	
		<table border="1">
			<tr>
				<th>&nbsp;</th>
				<th><fmt:message key="pam.details.role_name"/></th>
				<th><fmt:message key="pam.details.role_link"/></th>
				<th><fmt:message key="pam.details.locale"/> / <fmt:message key="pam.details.description"/></th>
			</tr>
		<c:forEach var="therole" items="${roleSet.innerCollection}">
			<tr>
				<td>
					<input type="checkbox" name="security_remove_id" value="<c:out value="${therole.roleName}"/>"/>
				</td>
				<td>
					<input type="hidden" name="security_edit_id" value="<c:out value="${therole.roleName}"/>"/>
					<input type="text" name="<c:out value="${therole.roleName}"/>:name" value="<c:out value="${therole.roleName}"/>"/>
				</td>
				<td>
					<input type="text" name="<c:out value="${therole.roleName}"/>:link" value="<c:out value="${therole.roleLink}"/>"/>
				</td>
				<td>
					<%
						SecurityRoleRefComposite ref = (SecurityRoleRefComposite)pageContext.findAttribute("therole");
						pageContext.setAttribute("description_set", ref.getDescriptionSet());
					%>
					<table>
					<c:forEach var="description" items="${description_set.innerCollection}" varStatus="descStatus">
						<tr>
							<td>
								<c:out value="${description.locale}"/>
							</td>
							<td>
								<input type="text" name="<c:out value="${therole.roleName}"/>:description:<c:out value="${descStatus.index}"/>"
									value="<c:out value="${description.description}"/>"/>
							</td>
						</tr>
					</c:forEach>
					</table>
				</td>
			</tr>
		</c:forEach>
		</table>
	
		<input type="submit" value="<fmt:message key="pam.details.edit"/>" onClick="this.form.portlet_action.value = 'portlet.edit_security'"/>
		<input type="submit" value="<fmt:message key="pam.details.remove"/>" onClick="this.form.portlet_action.value = 'portlet.remove_security'"/>
	
	</form>
	</c:if>

	<form action="<c:out value="${edit_security_link}"/>">
		<input type="hidden" name="portlet_action" value="portlet.add_security"/>
		<table>
			<tr>
				<td>
					<fmt:message key="pam.details.role_name"/>
				</td>
				<td>
					<input type="text" name="name" value=""/>
				</td>
				<td>
					<fmt:message key="pam.details.role_name.description"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.role_link"/>
				</td>
				<td>
					<input type="text" name="link" value=""/>
				</td>
				<td>
					<fmt:message key="pam.details.role_link.description"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.description"/>
				</td>
				<td>
					<input type="text" name="description" value=""/>
				</td>
				<td>
					<fmt:message key="pam.details.description.description"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.locale"/>
				</td>
				<td>
					<input type="text" name="locale" value="" size="2"/>
				</td>
				<td>
					<fmt:message key="pam.details.locale.description"/>
				</td>
			</tr>
		</table>
		<input type="submit" value="<fmt:message key="pam.details.add_security"/>"/>
	</form>

</c:if>

<c:if test="${selectedPortletTab.id == 'pd_content_type'}">
	<c:set var="contentTypeSet" value="${selectedPDef.contentTypeSet}"/>
	
	<portlet:actionURL var="edit_content_type_link" >
    </portlet:actionURL>

	<c:if test="${! empty contentTypeSet.innerCollection}">
	<form action="<c:out value="${edit_content_type_link}"/>">
		<input type="hidden" name="portlet_action" value=""/>
		<table border="1">
			<tr>
				<th>&nbsp;</th>
				<th><fmt:message key="pam.details.content_type"/></th>
				<td><fmt:message key="pam.details.modes"/></th>
			</tr>
		<c:forEach var="contentType" items="${contentTypeSet.innerCollection}">
			<tr>
				<td>
					<input type="checkbox" name="content_type_remove_id" value="<c:out value="${contentType.contentType}"/>"/>
				</td>
				<td>
					
					<c:out value="${contentType.contentType}"/>
				</td>
				<td>			
					<c:forEach var="mode" items="${contentType.portletModes}">
						<c:out value="${mode}"/>, 
					</c:forEach>
				</td>			
			</tr>
		</c:forEach>
		</table>
		
		<input type="submit" value="<fmt:message key="pam.details.edit"/>" onClick="this.form.portlet_action.value = 'portlet.edit_content_type'"/>
		<input type="submit" value="<fmt:message key="pam.details.remove"/>" onClick="this.form.portlet_action.value = 'portlet.remove_content_type'"/>
	</form>
	</c:if>
	
	<form action="<c:out value="${edit_content_type_link}"/>">
		<input type="hidden" name="portlet_action" value="portlet.add_content_type"/>
		<table>
			<tr>
				<td>
					<fmt:message key="pam.details.content_type"/>
				</td>
				<td>
					<%--TODO:  this could be a select box--%>
					<input type="text" name="content_type" value=""/>
				</td>
				<td>
					<fmt:message key="pam.details.content_type.description"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.portlet_mode"/>
				</td>
				<td>
					<select name="mode" multiple="true">
						<option value="view"><fmt:message key="pam.details.porltet_mode.view"/></option>
						<option value="edit"><fmt:message key="pam.details.porltet_mode.edit"/></option>
						<option value="help"><fmt:message key="pam.details.porltet_mode.help"/></option>
					</select>
				</td>
				<td>
					<fmt:message key="pam.details.portlet_mode.description"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.custom_mode"/>
				</td>
				<td>
					<%--TODO:  this could be a select box--%>
					<input type="text" name="custom_modes" value=""/>
				</td>
				<td>
					<fmt:message key="pam.details.custom_modes.description"/>
				</td>
			</tr>
		</table>
		<input type="submit" value="<fmt:message key="pam.details.add_content_type"/>"/>
	</form>
</c:if>
  \ No newline at end of file
  +<%--
Copyright 2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
    http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--%>
<c:set var="portlet_tabs" value="${requestScope.portlet_tabs}"/>

<c:set var="selectedPortletTab" value="${requestScope.selected_portlet_tab}"/>

<span class="portlet-section-header">Selected Portlet</span>
<c:out value="${selectedPDef.name}"/>
<div id="portlet_tabs">

	<c:set var="tab_items" value="${portlet_tabs}"/>
	<c:set var="currentTab" value="${selectedPortletTab}"/>
	<c:set var="url_param_name" value="selected_portlet_tab"/>
	<%@ include file="tabs.jsp"%>
</div>

<br />

<c:if test="${selectedPortletTab.id == 'pd_details'}">
	<portlet:actionURL var="edit_portlet_link" >
    </portlet:actionURL>
	
	<form action="<c:out value="${edit_portlet_link}"/>" method="post">
		<input type="hidden" name="portlet_action" value="portlet.edit_portlet"/>
	<table>
		<tr>
			<td>
				<fmt:message key="pam.details.expiration_cache"/>
			</td>
			<td>
				<c:out value="${selectedPDef.expirationCache}"/>
			</td>
		</tr>
		</tr>
			<td>
				<fmt:message key="pam.details.id"/>
			</td>
			<td>
				<c:out value="${selectedPDef.portletIdentifier}"/>
			</td>
		</tr>
		</tr>
			<td>
				<fmt:message key="pam.details.unique_name"/>
			</td>
			<td>
				<c:out value="${selectedPDef.uniqueName}"/>
			</td>
		</tr>
		</tr>
			<td>
				<fmt:message key="pam.details.preference_validator"/>
			</td>
			<td>
				<c:out value="${selectedPDef.preferenceValidatorClassname}"/>
			</td>
		</tr>
		</tr>
			<td>
				<fmt:message key="pam.details.class_name"/>
			</td>
			<td>
				<c:out value="${selectedPDef.className}"/>
			</td>
		</tr>
		<tr>
			<td>
				<fmt:message key="pam.details.display_name"/>
			</td>
			<td>
				<table>
					<%
						PortletDefinitionComposite portlet = (PortletDefinitionComposite)pageContext.findAttribute("selectedPDef");
						pageContext.setAttribute("displayNameSet", portlet.getDisplayNameSet());
					%>
					<c:forEach var="displayName" items="${displayNameSet.innerCollection}" varStatus="displayNameStatus">
						<tr>
							
							<td><c:out value="${displayName.locale}"/></td>
							<td><input type="text" name="display_name:<c:out value="${displayNameStatus.index}"/>" value="<c:out value="${displayName.displayName}"/>"/></td>
						</tr>
					</c:forEach>
				</table>
			</td>
		</tr>
	</table>
	
		<input type="submit" value="<fmt:message key="pam.details.edit_display_name"/>"/>
	</form>
	
	<form action="<c:out value="${edit_portlet_link}"/>" method="post">
		<input type="hidden" name="portlet_action" value="portlet.edit_portlet"/>
		<table>
			<tr>
				<td>
					<fmt:message key="pam.details.display_name"/>
				</td>
				<td>
					<input type="text" name="display_name" value=""/>
				</td>
				<td>
					<fmt:message key="pam.details.display_name.description"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.locale"/>
				</td>
				<td>
					<input type="text" name="locale" value="" size="2"/>
				</td>
				<td>
					<fmt:message key="pam.details.locale.description"/>
				</td>
			</tr>
		</table>
		<input type="submit" value="<fmt:message key="pam.details.add_display_name"/>"/>
	</form>
</c:if>

<c:if test="${selectedPortletTab.id == 'pd_metadata'}">
	<div id="portlet_metadata">
			
		<c:set var="md" value="${selectedPDef.metadata}"/>
		<c:set var="action_prefix" value="portlet."/>
		<portlet:actionURL var="edit_metadata_link" >			
		</portlet:actionURL>
		
		<%@ include file="metadata-detail.jsp" %>
	</div>
</c:if>

<c:if test="${selectedPortletTab.id == 'pd_preferences'}">
	<c:set var="prefSet" value="${selectedPDef.preferenceSet}"/>
	<%
		PreferenceSetComposite comp = (PreferenceSetComposite)pageContext.findAttribute("prefSet");
		Iterator prefIter = comp.iterator();
		pageContext.setAttribute("prefIter", prefIter);
	%>
	
	<portlet:actionURL var="edit_preferenece_link" >
    </portlet:actionURL>
	
	<form action="<c:out value="${edit_preferenece_link}"/>" method="post">
		<input type="hidden" name="portlet_action" value=""/>
		<table border="1">
			<tr>
				<th>&nbsp;</th>
				<th><fmt:message key="pam.details.name"/></th>
				<th><fmt:message key="pam.details.value"/></th>
			</tr>
			<tr>
				<td colspan="3">&nbsp;</td>
			</td>
		<c:forEach var="pref" items="${prefIter}">
			<tr>
				<td>
					<input type="checkbox" name="pref_remove_id" value="<c:out value="${pref.name}"/>"/>
				</td>
				<td>
					<c:out value="${pref.name}"/>
					<input type="hidden" name="pref_edit_id" value="<c:out value="${pref.name}"/>"/>
				</td>
				<td>
					<table>
					<c:forEach var="value" items="${pref.values}" varStatus="status">
						<tr>
							<td>
								<input type="text" name="<c:out value="${pref.name}"/>:<c:out value="${status.index}"/>" value="<c:out value="${value}"/>"/>
							</td>
						</tr>
					</c:forEach>
					</table>
				</tr>
			</tr>
		</c:forEach>
		</table>
		
		<input type="submit" value="<fmt:message key="pam.details.edit"/>" onClick="this.form.portlet_action.value = 'portlet.edit_preference'"/>
		<input type="submit" value="<fmt:message key="pam.details.remove"/>" onClick="this.form.portlet_action.value = 'portlet.remove_preference'"/>
	</form>
	
	<hr />
	
	
	<form action="<c:out value="${edit_preferenece_link}"/>" method="post">
		<input type="hidden" name="portlet_action" value="portlet.add_preference"/>
		<table>
			<tr>
				<td>
					<fmt:message key="pam.details.name"/>
				</td>
				<td>
					<input type="text" name="name"/>
				</td>
				<%--TODO add combo box of existing keys--%>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.value"/>
				</td>
				<td>
					<input type="text" name="value"/>
				</td>
			</tr>
			<%--
			<tr>
				<td>
					<fmt:message key="pam.details.type"/>
				</td>
				<td>
					<select>
						<option value="string">String</option>
						<option value="int">Int</option>
					</select>
				</td>
			</tr>
			--%>
		</table>
		<input type="submit" value="<fmt:message key="pam.details.add_preference"/>"/>
	</form>
</c:if>

<c:if test="${selectedPortletTab.id == 'pd_languages'}">
	<c:set var="langSet" value="${selectedPDef.languageSet}"/>
	
	<portlet:actionURL var="edit_language_link" >
    </portlet:actionURL>
	
	<form action="<c:out value="${edit_language_link}"/>" method="post">
		<input type="hidden" name="portlet_action" value=""/>
	<table border="1">
		<tr>
			<th>&nbsp;</th>
			<th><fmt:message key="pam.details.title"/></th>
			<th><fmt:message key="pam.details.short_title"/></th>
			<th><fmt:message key="pam.details.keyword"/></th>
			<th><fmt:message key="pam.details.locale"/></th>
		</tr>
	<c:forEach var="lang" items="${langSet.innerCollection}" varStatus="status">
		<tr>
			<td>
				<input type="checkbox" name="language_remove_id" value="<c:out value="${status.index}"/>"/>
				<input type="hidden" name="language_edit_id" value="<c:out value="${status.index}"/>"/>
			</td>
			<td>
				<input type="text" name="title:<c:out value="${status.index}"/>" value="<c:out value="${lang.title}"/>"/>
			</td>
			<td>
				<input type="text" name="short_title:<c:out value="${status.index}"/>" value="<c:out value="${lang.shortTitle}"/>"/>
			</td>
			<td>
				<table>
				<c:forEach var="keyword" items="${lang.keywords}" varStatus="keywordStatus">
					<tr>
						<td>
							<input type="text" name="keyword:<c:out value="${status.index}"/>:<c:out value="${keywordStatus.index}"/>" value="<c:out value="${keyword}"/>"/>
						</td>
					</tr>
				</c:forEach>
				</table>
				<%--
				<input type="text" name="keyword:<c:out value="${status.index}"/>" value="<c:forEach var="keyword" items="${lang.keywords}" varStatus="keywordStatus"><c:out value="${keyword}"/>,</c:forEach>"/>
				--%>
			</td>
			<td>
				<c:out value="${lang.locale}"/>
			</td>
		</tr>
	</c:forEach>
	</table>
	
		<input type="submit" value="<fmt:message key="pam.details.edit"/>" onClick="this.form.portlet_action.value = 'portlet.edit_language'"/>
		<input type="submit" value="<fmt:message key="pam.details.remove"/>" onClick="this.form.portlet_action.value = 'portlet.remove_language'"/>
	</form>
	
	<form action="<c:out value="${edit_language_link}"/>" method="post">
		<input type="hidden" name="portlet_action" value="portlet.add_language"/>
		
		<table>
			<tr>
				<td>
					<fmt:message key="pam.details.title"/>
				</td>
				<td>
					<input type="text" name="title" value=""/>
				</td>
				<td>
					<fmt:message key="pam.details.title.description"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.short_title"/>
				</td>
				<td>
					<input type="text" name="short_title" value=""/>
				</td>
				<td>
					<fmt:message key="pam.details.short_title.description"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.keyword"/>
				</td>
				<td>
					<input type="text" name="keyword" value=""/>
				</td>
				<td>
					<fmt:message key="pam.details.keyword.description"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.locale"/>
				</td>
				<td>
					<input type="text" name="locale" value="" size="2"/>
				</td>
				<td>
					<fmt:message key="pam.details.locale.description"/>
				</td>
			</tr>
		</table>
		
		<input type="submit" value="<fmt:message key="pam.details.add_language"/>"/>
	</form>
</c:if>

<c:if test="${selectedPortletTab.id == 'pd_parameters'}">
	<c:set var="paramSet" value="${selectedPDef.initParameterSet}"/>
	
	<portlet:actionURL var="edit_parameter_link" >
    </portlet:actionURL>
	
	<%--
		TODO:  if needed, place iterator into page context
		see prefs section
	--%>
	
	<form action="<c:out value="${edit_parameter_link}"/>" method="post">
		<input type="hidden" name="portlet_action" value=""/>
	
	<table border="1">
		<tr>
			<th>&nbsp;</th>
			<th><fmt:message key="pam.details.name"/></th>
			<th><fmt:message key="pam.details.value"/></th>
			<th><fmt:message key="pam.details.locale"/> / <fmt:message key="pam.details.description"/></th>
		</tr>
	<c:forEach var="theparam" items="${paramSet.innerCollection}">
		<tr>
			<td>
				<input type="checkbox" name="parameter_remove_id" value="<c:out value="${theparam.name}"/>" />
			</td>
			<td>
				<input type="hidden" name="parameter_edit_id" value="<c:out value="${theparam.name}"/>" />
				<c:out value="${theparam.name}"/>
			</td>
			<td>
				<input type="text" name="<c:out value="${theparam.name}"/>:value" value="<c:out value="${theparam.value}"/>"/>
			</td>
			<td>
				<%
					ParameterComposite param = (ParameterComposite)pageContext.findAttribute("theparam");
					pageContext.setAttribute("description_set", param.getDescriptionSet());
				%>
				<table>
				<c:forEach var="description" items="${description_set.innerCollection}" varStatus="descStatus">
					<tr>
						<td>
							<c:out value="${description.locale}"/>
						</td>
						<td>
							<input type="text" name="<c:out value="${theparam.name}"/>:description:<c:out value="${descStatus.index}"/>"
								value="<c:out value="${description.description}"/>"/>
						</td>
					</tr>
				</c:forEach>
				</table>
			</td>
		</tr>
	</c:forEach>
	</table>
	
		<input type="submit" value="<fmt:message key="pam.details.edit"/>" onClick="this.form.portlet_action.value = 'portlet.edit_parameter'"/>
		<input type="submit" value="<fmt:message key="pam.details.remove"/>" onClick="this.form.portlet_action.value = 'portlet.remove_parameter'"/>
	
	</form>
	
	<form action="<c:out value="${edit_parameter_link}"/>" method="post">
		<input type="hidden" name="portlet_action" value="portlet.add_parameter"/>
		<table>
			<tr>
				<td>
					<fmt:message key="pam.details.name"/>
				</td>
				<td>
					<input type="text" name="name" value=""/>
				</td>
				<td>
					<fmt:message key="pam.details.name.description"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.value"/>
				</td>
				<td>
					<input type="text" name="value" value=""/>
				</td>
				<td>
					<fmt:message key="pam.details.value.description"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.description"/>
				</td>
				<td>
					<input type="text" name="description" value=""/>
				</td>
				<td>
					<fmt:message key="pam.details.description.description"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.locale"/>
				</td>
				<td>
					<input type="text" name="locale" value="" size="2"/>
				</td>
				<td>
					<fmt:message key="pam.details.locale.description"/>
				</td>
			</tr>
		</table>
		<input type="submit" value="<fmt:message key="pam.details.add_parameter"/>"/>
	</form>
	
</c:if>
<c:if test="${selectedPortletTab.id == 'pd_security'}">
	<c:set var="roleSet" value="${selectedPDef.initSecurityRoleRefSet}"/>
	
	<portlet:actionURL var="edit_security_link" >
    </portlet:actionURL>

	<c:if test="${! empty roleSet.innerCollection}">
	<form action="<c:out value="${edit_security_link}"/>" method="post">
		<input type="hidden" name="portlet_action" value=""/>	
	
		<table border="1">
			<tr>
				<th>&nbsp;</th>
				<th><fmt:message key="pam.details.role_name"/></th>
				<th><fmt:message key="pam.details.role_link"/></th>
				<th><fmt:message key="pam.details.locale"/> / <fmt:message key="pam.details.description"/></th>
			</tr>
		<c:forEach var="therole" items="${roleSet.innerCollection}">
			<tr>
				<td>
					<input type="checkbox" name="security_remove_id" value="<c:out value="${therole.roleName}"/>"/>
				</td>
				<td>
					<input type="hidden" name="security_edit_id" value="<c:out value="${therole.roleName}"/>"/>
					<input type="text" name="<c:out value="${therole.roleName}"/>:name" value="<c:out value="${therole.roleName}"/>"/>
				</td>
				<td>
					<input type="text" name="<c:out value="${therole.roleName}"/>:link" value="<c:out value="${therole.roleLink}"/>"/>
				</td>
				<td>
					<%
						SecurityRoleRefComposite ref = (SecurityRoleRefComposite)pageContext.findAttribute("therole");
						pageContext.setAttribute("description_set", ref.getDescriptionSet());
					%>
					<table>
					<c:forEach var="description" items="${description_set.innerCollection}" varStatus="descStatus">
						<tr>
							<td>
								<c:out value="${description.locale}"/>
							</td>
							<td>
								<input type="text" name="<c:out value="${therole.roleName}"/>:description:<c:out value="${descStatus.index}"/>"
									value="<c:out value="${description.description}"/>"/>
							</td>
						</tr>
					</c:forEach>
					</table>
				</td>
			</tr>
		</c:forEach>
		</table>
	
		<input type="submit" value="<fmt:message key="pam.details.edit"/>" onClick="this.form.portlet_action.value = 'portlet.edit_security'"/>
		<input type="submit" value="<fmt:message key="pam.details.remove"/>" onClick="this.form.portlet_action.value = 'portlet.remove_security'"/>
	
	</form>
	</c:if>

	<form action="<c:out value="${edit_security_link}"/>" method="post">
		<input type="hidden" name="portlet_action" value="portlet.add_security"/>
		<table>
			<tr>
				<td>
					<fmt:message key="pam.details.role_name"/>
				</td>
				<td>
					<input type="text" name="name" value=""/>
				</td>
				<td>
					<fmt:message key="pam.details.role_name.description"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.role_link"/>
				</td>
				<td>
					<input type="text" name="link" value=""/>
				</td>
				<td>
					<fmt:message key="pam.details.role_link.description"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.description"/>
				</td>
				<td>
					<input type="text" name="description" value=""/>
				</td>
				<td>
					<fmt:message key="pam.details.description.description"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.locale"/>
				</td>
				<td>
					<input type="text" name="locale" value="" size="2"/>
				</td>
				<td>
					<fmt:message key="pam.details.locale.description"/>
				</td>
			</tr>
		</table>
		<input type="submit" value="<fmt:message key="pam.details.add_security"/>"/>
	</form>

</c:if>

<c:if test="${selectedPortletTab.id == 'pd_content_type'}">
	<c:set var="contentTypeSet" value="${selectedPDef.contentTypeSet}"/>
	
	<portlet:actionURL var="edit_content_type_link" >
    </portlet:actionURL>

	<c:if test="${! empty contentTypeSet.innerCollection}">
	<form action="<c:out value="${edit_content_type_link}"/>" method="post">
		<input type="hidden" name="portlet_action" value=""/>
		<table border="1">
			<tr>
				<th>&nbsp;</th>
				<th><fmt:message key="pam.details.content_type"/></th>
				<td><fmt:message key="pam.details.modes"/></th>
			</tr>
		<c:forEach var="contentType" items="${contentTypeSet.innerCollection}">
			<tr>
				<td>
					<input type="checkbox" name="content_type_remove_id" value="<c:out value="${contentType.contentType}"/>"/>
				</td>
				<td>
					
					<c:out value="${contentType.contentType}"/>
				</td>
				<td>			
					<c:forEach var="mode" items="${contentType.portletModes}">
						<c:out value="${mode}"/>, 
					</c:forEach>
				</td>			
			</tr>
		</c:forEach>
		</table>
		
		<input type="submit" value="<fmt:message key="pam.details.edit"/>" onClick="this.form.portlet_action.value = 'portlet.edit_content_type'"/>
		<input type="submit" value="<fmt:message key="pam.details.remove"/>" onClick="this.form.portlet_action.value = 'portlet.remove_content_type'"/>
	</form>
	</c:if>
	
	<form action="<c:out value="${edit_content_type_link}"/>" method="post">
		<input type="hidden" name="portlet_action" value="portlet.add_content_type"/>
		<table>
			<tr>
				<td>
					<fmt:message key="pam.details.content_type"/>
				</td>
				<td>
					<%--TODO:  this could be a select box--%>
					<input type="text" name="content_type" value=""/>
				</td>
				<td>
					<fmt:message key="pam.details.content_type.description"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.portlet_mode"/>
				</td>
				<td>
					<select name="mode" multiple="true">
						<option value="view"><fmt:message key="pam.details.porltet_mode.view"/></option>
						<option value="edit"><fmt:message key="pam.details.porltet_mode.edit"/></option>
						<option value="help"><fmt:message key="pam.details.porltet_mode.help"/></option>
					</select>
				</td>
				<td>
					<fmt:message key="pam.details.portlet_mode.description"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.custom_mode"/>
				</td>
				<td>
					<%--TODO:  this could be a select box--%>
					<input type="text" name="custom_modes" value=""/>
				</td>
				<td>
					<fmt:message key="pam.details.custom_modes.description"/>
				</td>
			</tr>
		</table>
		<input type="submit" value="<fmt:message key="pam.details.add_content_type"/>"/>
	</form>
</c:if>
  \ No newline at end of file
  
  
  
  1.13      +1 -1      jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/pam-detail.jsp
  
  Index: pam-detail.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/pam-detail.jsp,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- pam-detail.jsp	23 Sep 2004 20:54:43 -0000	1.12
  +++ pam-detail.jsp	24 Sep 2004 22:21:15 -0000	1.13
  @@ -1 +1 @@
  -<%--
Copyright 2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
    http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--%>
<%@ page language="java" session="true" %>
<%@ page import="javax.portlet.*" %>
<%@ page import="java.util.*" %>
<%@ page import="org.apache.jetspeed.portlets.pam.beans.TabBean" %>
<%@ page import="org.apache.jetspeed.om.common.preference.*" %>
<%@ page import="org.apache.jetspeed.om.common.*" %>
<%@ page import="org.apache.jetspeed.om.common.portlet.*" %>

<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>

<fmt:setBundle basename="org.apache.jetspeed.portlets.pam.resources.PAMResources" />


<portlet:defineObjects/>

<c:set var="pa" value="${requestScope.portletApplication}" />
<c:set var="name" value="${pa.name}" />
<c:set var="version" value="${pa.version}" />

<c:set var="tabs" value="${requestScope.tabs}"/>
<c:set var="selectedTab" value="${requestScope.selected_tab}"/>
<c:set var="selectedPDef" value="${requestScope.portletDefinition}"/>

<fmt:message key="pam.details.name"/> = <c:out value="${name}"/><br />
<fmt:message key="pam.details.version"/> = <c:out value="${version}"/> <br />

<div id="tabs">
	<c:set var="tab_items" value="${tabs}"/>
	<c:set var="currentTab" value="${selectedTab}"/>
	<c:set var="url_param_name" value="selected_tab"/>
	<%@ include file="tabs.jsp"%>
</div>

<%--Beginning of Portlets tab data--%>
<%--TODO:  switch to c:choose --%>
<c:if test="${selectedTab.id == 'pa_portlets'}">
  <div id="portlets">
	
	<portlet:actionURL var="select_portlet_link" >
        <%--<portlet:param name="select_portlet" value="<%= pdefName %>" />--%>
    </portlet:actionURL>
	<form action="<c:out value="${select_portlet_link}"/>">
		<select name="select_portlet" onChange="this.form.submit();">
		
			<option value="" <c:if test="! ${selectedPDef}"> selected="true"</c:if> >
				<fmt:message key="pam.details.choose_portlet"/>
			</option>

			<c:forEach var="portletDef" items="${pa.portletDefinitions}">
			    <c:set var="pdefName" value="${portletDef.name}"/>
			    
			    <%--We must do this since portlet taglib doesn't support expressions--%>
			    <% String pdefName = (String) pageContext.getAttribute("pdefName"); %>
			    
			    <option value="<c:out value="${portletDef.name}"/>" <c:if test="${selectedPDef.name == portletDef.name}">selected="true"</c:if>>
				  <c:out value="${portletDef.name}"/>
			    </option>
				<%--
			    <a href="<c:out value="${select_portlet_link}"/>">
			        <c:out value="${portletDef.name}" /><br />
			    </a>
			    --%>
			</c:forEach>
		</select>
		
		<!--<input type="submit" value="Select"/>-->
    </form>
  </div>
    
  <div id="selectedPortlet" class="">
	
	<c:if test="${selectedPDef != null}">
		<%@ include file="portlet-detail.jsp" %>
	</c:if>
    
  </div>
</c:if>
<%--End of Portlets tab data--%>

<%--Beginning of UserAttr tab data--%>
<%--TODO:  switch to c:choose --%>
<c:if test="${selectedTab.id == 'pa_user_attribtues'}">
  <div id="Details">
	<portlet:actionURL var="edit_user_attr_link" >
	</portlet:actionURL>
		
	<form name="Edit_UserAttr_Form" action="<c:out value="${edit_user_attr_link}"/>">
		<input type="hidden" name="portlet_action" value="portlet_app.edit_user_attribute"/>
		
		<table>
			<tr>
				<th>&nbsp;</th>
				<th><fmt:message key="pam.details.name"/></th>
				<th><fmt:message key="pam.details.value"/></th>
			</tr>
		<c:forEach var="userAttr" items="${pa.userAttributes}">
			<tr>
			<%--<input type="hidden" name="user_attr_name" value="<c:out value="${userAttr.name}"/>"/>--%>
			
				<td>
					<input type="checkbox" name="user_attr_id" value="<c:out value="${userAttr.name}"/>"/>
				</td>
				<td>
					<c:out value="${userAttr.name}"/>
				</td>
				<td>
					<input type="text" name="<c:out value="${userAttr.name}"/>:description" value="<c:out value="${userAttr.description}"/>"/>
				</td>
			</tr>
		</c:forEach>
		</table>
		
		<input type="submit" value="<fmt:message key="pam.details.edit"/>" onClick="this.form.portlet_action.value = 'portlet_app.edit_user_attribute'"/>
		<input type="submit" value="<fmt:message key="pam.details.remove"/>" onClick="this.form.portlet_action.value = 'portlet_app.remove_user_attribute'"/>
	</form>
	
	<form action="<c:out value="${edit_user_attr_link}"/>">
		<input type="hidden" name="portlet_action" value="portlet_app.add_user_attribute"/>
		
		<table>
			<tr>
				<td>
					<fmt:message key="pam.details.name"/>
				</td>
				<td>
					<input type="text" name="user_attr_name" value=""/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.description"/>
				</td>
				<td>
					<input type="text" name="user_attr_desc" value=""/>
				</td>
			</tr>
		</table>
		<input type="submit" value="<fmt:message key="pam.details.add_user_attribute"/>"/>
	</form>
  </div>
</c:if>
<%--End of UserAttr tab data--%>


<%--Beginning of Metadata tab data--%>
<%--TODO:  switch to c:choose --%>
<c:if test="${selectedTab.id == 'pa_metadata'}">
	<div id="metadata">
		<c:set var="md" value="${pa.metadata}"/>
	
		<portlet:actionURL var="edit_metadata_link" >
			
		</portlet:actionURL>
		<c:set var="action_prefix" value="portlet_app."/>
		
		<%@ include file="metadata-detail.jsp" %>
		
	</div>
</c:if>
<%--End of Metadata tab data--%>

<%--Beginning of Details tab data--%>
<%--TODO:  switch to c:choose --%>
<c:if test="${selectedTab.id == 'pa_details'}">
	<div id="details">
		<table>
			<tr>
				<td>
					<fmt:message key="pam.details.name"/>
				<td>
					<c:out value="${name}"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.version"/>
				</td>
				<td>
					<c:out value="${version}"/>
				</td>
			</tr>
			<tr>
				<td>		
					<fmt:message key="pam.details.description"/>
				</td>
				<td>
					<c:out value="${pa.description}"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.type"/>
				</td>
				<td>
					<c:choose>
						<c:when test="${pa.applicationType == '0'}">
							<fmt:message key="pam.details.type.webapp"/>
						</c:when>
						<c:when test="${pa.applicationType == '1'}">
							<fmt:message key="pam.details.type.local"/>
						</c:when>
					</c:choose>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.id"/>
				</td>
				<td>
					<c:out value="${pa.applicationIdentifier}"/>
				</td>
			</tr>
		</table>
	
		
		<c:if test="${! empty pa.jetspeedServices}">
			<hr />
			<fmt:message key="pam.details.services"/>
			<hr />
			<c:forEach var="service" items="${pa.jetspeedServices}">
				<c:out value="${service.name}"/> <br /> <%--| <c:out value="${service.appId}"/> | <c:out value="${service.id}"/><br />--%>
			</c:forEach>
		</c:if>
	</div>
</c:if>
<%--End of Details tab data--%>

<br />
<br />


  \ No newline at end of file
  +<%--
Copyright 2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
    http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--%>
<%@ page language="java" session="true" %>
<%@ page import="javax.portlet.*" %>
<%@ page import="java.util.*" %>
<%@ page import="org.apache.jetspeed.portlets.pam.beans.TabBean" %>
<%@ page import="org.apache.jetspeed.om.common.preference.*" %>
<%@ page import="org.apache.jetspeed.om.common.*" %>
<%@ page import="org.apache.jetspeed.om.common.portlet.*" %>

<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>

<fmt:setBundle basename="org.apache.jetspeed.portlets.pam.resources.PAMResources" />


<portlet:defineObjects/>

<c:set var="pa" value="${requestScope.portletApplication}" />
<c:set var="name" value="${pa.name}" />
<c:set var="version" value="${pa.version}" />

<c:set var="tabs" value="${requestScope.tabs}"/>
<c:set var="selectedTab" value="${requestScope.selected_tab}"/>
<c:set var="selectedPDef" value="${requestScope.portletDefinition}"/>

<fmt:message key="pam.details.name"/> = <c:out value="${name}"/><br />
<fmt:message key="pam.details.version"/> = <c:out value="${version}"/> <br />

<div id="tabs">
	<c:set var="tab_items" value="${tabs}"/>
	<c:set var="currentTab" value="${selectedTab}"/>
	<c:set var="url_param_name" value="selected_tab"/>
	<%@ include file="tabs.jsp"%>
</div>

<%--Beginning of Portlets tab data--%>
<%--TODO:  switch to c:choose --%>
<c:if test="${selectedTab.id == 'pa_portlets'}">
  <div id="portlets">
	
	<portlet:actionURL var="select_portlet_link" >
        <%--<portlet:param name="select_portlet" value="<%= pdefName %>" />--%>
    </portlet:actionURL>
	<form action="<c:out value="${select_portlet_link}"/>" method="post">
		<select name="select_portlet" onChange="this.form.submit();">
		
			<option value="" <c:if test="! ${selectedPDef}"> selected="true"</c:if> >
				<fmt:message key="pam.details.choose_portlet"/>
			</option>

			<c:forEach var="portletDef" items="${pa.portletDefinitions}">
			    <c:set var="pdefName" value="${portletDef.name}"/>
			    
			    <%--We must do this since portlet taglib doesn't support expressions--%>
			    <% String pdefName = (String) pageContext.getAttribute("pdefName"); %>
			    
			    <option value="<c:out value="${portletDef.name}"/>" <c:if test="${selectedPDef.name == portletDef.name}">selected="true"</c:if>>
				  <c:out value="${portletDef.name}"/>
			    </option>
				<%--
			    <a href="<c:out value="${select_portlet_link}"/>">
			        <c:out value="${portletDef.name}" /><br />
			    </a>
			    --%>
			</c:forEach>
		</select>
		
		<!--<input type="submit" value="Select"/>-->
    </form>
  </div>
    
  <div id="selectedPortlet" class="">
	
	<c:if test="${selectedPDef != null}">
		<%@ include file="portlet-detail.jsp" %>
	</c:if>
    
  </div>
</c:if>
<%--End of Portlets tab data--%>

<%--Beginning of UserAttr tab data--%>
<%--TODO:  switch to c:choose --%>
<c:if test="${selectedTab.id == 'pa_user_attribtues'}">
  <div id="Details">
	<portlet:actionURL var="edit_user_attr_link" >
	</portlet:actionURL>
		
	<form name="Edit_UserAttr_Form" action="<c:out value="${edit_user_attr_link}"/>" method="post">
		<input type="hidden" name="portlet_action" value="portlet_app.edit_user_attribute"/>
		
		<table>
			<tr>
				<th>&nbsp;</th>
				<th><fmt:message key="pam.details.name"/></th>
				<th><fmt:message key="pam.details.value"/></th>
			</tr>
		<c:forEach var="userAttr" items="${pa.userAttributes}">
			<tr>
			<%--<input type="hidden" name="user_attr_name" value="<c:out value="${userAttr.name}"/>"/>--%>
			
				<td>
					<input type="checkbox" name="user_attr_id" value="<c:out value="${userAttr.name}"/>"/>
				</td>
				<td>
					<c:out value="${userAttr.name}"/>
				</td>
				<td>
					<input type="text" name="<c:out value="${userAttr.name}"/>:description" value="<c:out value="${userAttr.description}"/>"/>
				</td>
			</tr>
		</c:forEach>
		</table>
		
		<input type="submit" value="<fmt:message key="pam.details.edit"/>" onClick="this.form.portlet_action.value = 'portlet_app.edit_user_attribute'"/>
		<input type="submit" value="<fmt:message key="pam.details.remove"/>" onClick="this.form.portlet_action.value = 'portlet_app.remove_user_attribute'"/>
	</form>
	
	<form action="<c:out value="${edit_user_attr_link}"/>" method="post">
		<input type="hidden" name="portlet_action" value="portlet_app.add_user_attribute"/>
		
		<table>
			<tr>
				<td>
					<fmt:message key="pam.details.name"/>
				</td>
				<td>
					<input type="text" name="user_attr_name" value=""/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.description"/>
				</td>
				<td>
					<input type="text" name="user_attr_desc" value=""/>
				</td>
			</tr>
		</table>
		<input type="submit" value="<fmt:message key="pam.details.add_user_attribute"/>"/>
	</form>
  </div>
</c:if>
<%--End of UserAttr tab data--%>


<%--Beginning of Metadata tab data--%>
<%--TODO:  switch to c:choose --%>
<c:if test="${selectedTab.id == 'pa_metadata'}">
	<div id="metadata">
		<c:set var="md" value="${pa.metadata}"/>
	
		<portlet:actionURL var="edit_metadata_link" >
			
		</portlet:actionURL>
		<c:set var="action_prefix" value="portlet_app."/>
		
		<%@ include file="metadata-detail.jsp" %>
		
	</div>
</c:if>
<%--End of Metadata tab data--%>

<%--Beginning of Details tab data--%>
<%--TODO:  switch to c:choose --%>
<c:if test="${selectedTab.id == 'pa_details'}">
	<div id="details">
		<table>
			<tr>
				<td>
					<fmt:message key="pam.details.name"/>
				<td>
					<c:out value="${name}"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.version"/>
				</td>
				<td>
					<c:out value="${version}"/>
				</td>
			</tr>
			<tr>
				<td>		
					<fmt:message key="pam.details.description"/>
				</td>
				<td>
					<c:out value="${pa.description}"/>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.type"/>
				</td>
				<td>
					<c:choose>
						<c:when test="${pa.applicationType == '0'}">
							<fmt:message key="pam.details.type.webapp"/>
						</c:when>
						<c:when test="${pa.applicationType == '1'}">
							<fmt:message key="pam.details.type.local"/>
						</c:when>
					</c:choose>
				</td>
			</tr>
			<tr>
				<td>
					<fmt:message key="pam.details.id"/>
				</td>
				<td>
					<c:out value="${pa.applicationIdentifier}"/>
				</td>
			</tr>
		</table>
	
		
		<c:if test="${! empty pa.jetspeedServices}">
			<hr />
			<fmt:message key="pam.details.services"/>
			<hr />
			<c:forEach var="service" items="${pa.jetspeedServices}">
				<c:out value="${service.name}"/> <br /> <%--| <c:out value="${service.appId}"/> | <c:out value="${service.id}"/><br />--%>
			</c:forEach>
		</c:if>
	</div>
</c:if>
<%--End of Details tab data--%>

<br />
<br />


  \ No newline at end of file
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message