taylor 2004/09/16 17:19:11
Modified: applications/pam/src/webapp/WEB-INF portlet.xml
Added: applications/pam/src/webapp/WEB-INF/view user-browser.jsp
user-details.jsp
Log:
cleanup on PAM portlets
user
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
1.1
jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/user-browser.jsp
Index: user-browser.jsp
===================================================================
<%--
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" import="javax.portlet.*, java.util.List,
java.util.Iterator, org.apache.jetspeed.om.common.portlet.MutablePortletApplication"
session="true" %>
<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
<%@ taglib uri="http://java.sun.com/jstl/core"; prefix="c" %>
<%@ taglib uri="/WEB-INF/pam.tld" prefix="pam" %>
<portlet:defineObjects/>
<h3>User Manager</h3>
<portlet:actionURL var="nodeLink" >
<portlet:param name="node" value="${name}" />
</portlet:actionURL>
<pam:tree tree="j2_tree" images="/pam/images" scope="portlet_request"
action="<%= nodeLink %>"
/>
<%--
style="tree-control"
styleSelected="tree-control-selected"
styleUnselected="tree-control-unselected"
--%>
1.1
jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/user-details.jsp
Index: user-details.jsp
===================================================================
<%--
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.*" %>
<%@ 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.security.resources.SecurityResources" />
<portlet:defineObjects/>
<c:set var="user" value="${requestScope.user}" />
<c:set var="tabs" value="${requestScope.tabs}"/>
<c:set var="selectedTab" value="${requestScope.selected_tab}"/>
<fmt:message key="user.details.name"/> = <c:out value="${name}"/><br />
<fmt:message key="user.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> </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 />
1.10 +50 -0
jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/portlet.xml
Index: portlet.xml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/portlet.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- portlet.xml 16 Sep 2004 21:30:39 -0000 1.9
+++ portlet.xml 17 Sep 2004 00:19:11 -0000 1.10
@@ -185,5 +185,55 @@
</portlet-info>
</portlet>
+<portlet id="UserBrowserPortlet">
+ <init-param>
+ <description>This parameter sets the template used in view mode.</description>
+ <name>ViewPage</name>
+ <value>/WEB-INF/view/user-browser.jsp</value>
+ </init-param>
+ <portlet-name>UserBrowserPortlet</portlet-name>
+ <display-name>User Browser</display-name>
+ <description>The User Browser displays a list of users managed in this portal.
From here you can add, edit, and users.</description>
+
<portlet-class>org.apache.jetspeed.portlets.security.UserBrowserPortlet</portlet-class>
+ <expiration-cache>-1</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>EDIT</portlet-mode>
+ <portlet-mode>VIEW</portlet-mode>
+ <portlet-mode>HELP</portlet-mode>
+ </supports>
+ <portlet-info>
+ <title>User Browser</title>
+ <short-title>Users</short-title>
+ <keywords>admin,security,users</keywords>
+ </portlet-info>
+ </portlet>
+
+<portlet id="UserDetailsPortlet">
+ <init-param>
+ <description>This parameter sets the template used in view mode.</description>
+ <name>ViewPage</name>
+ <value>/WEB-INF/view/user-details.jsp</value>
+ </init-param>
+ <portlet-name>UserDetailsPortlet</portlet-name>
+ <display-name>User Information</display-name>
+ <description>The User Details portlet displays a users details in a tabbed
view. From here you can add, edit, and user information.</description>
+
<portlet-class>org.apache.jetspeed.portlets.security.UserDetailsPortlet</portlet-class>
+ <expiration-cache>-1</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>EDIT</portlet-mode>
+ <portlet-mode>VIEW</portlet-mode>
+ <portlet-mode>HELP</portlet-mode>
+ </supports>
+ <portlet-info>
+ <title>User Detail Information</title>
+ <short-title>User</short-title>
+ <keywords>admin,security,users</keywords>
+ </portlet-info>
+ </portlet>
+
+</portlet-app>
+
</portlet-app>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
