taylor 2004/09/17 11:44:06
Modified: applications/pam/src/webapp/WEB-INF/view user-browser.jsp
user-details.jsp
Log:
checkpoint for continuing work on User Manager
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.2 +1 -1
jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/user-browser.jsp
Index: user-browser.jsp
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/user-browser.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- user-browser.jsp 17 Sep 2004 00:19:11 -0000 1.1
+++ user-browser.jsp 17 Sep 2004 18:44:06 -0000 1.2
@@ -15,7 +15,7 @@
<%@ 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>
1.2 +21 -185
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- user-details.jsp 17 Sep 2004 00:19:11 -0000 1.1
+++ user-details.jsp 17 Sep 2004 18:44:06 -0000 1.2
@@ -14,6 +14,7 @@
<%@ page import="javax.portlet.*" %>
<%@ page import="java.util.*" %>
<%@ page import="org.apache.jetspeed.portlets.pam.beans.TabBean" %>
+<%@ page import="org.apache.jetspeed.portlets.security.users.JetspeedUserBean" %>
<%@ page import="org.apache.jetspeed.om.common.preference.*" %>
<%@ page import="org.apache.jetspeed.om.common.*" %>
@@ -28,11 +29,17 @@
<c:set var="user" value="${requestScope.user}" />
+user = <c:out value="${user}"/>
+
+<%--Beginning of User check -%>
+<c:if test="${user != null}">
+
+userxxx = <c:out value="${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 />
+<fmt:message key="user.principal.name"/> = <c:out value="${user.Principal}"/><br />
<div id="tabs">
<c:set var="tab_items" value="${tabs}"/>
@@ -41,199 +48,28 @@
<%@ include file="tabs.jsp"%>
</div>
-<%--Beginning of Portlets tab data--%>
+<%--Beginning of User Attributes 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>
-
+<c:if test="${selectedTab.id == 'user_attributes'}">
+ <div id="attributes">
</div>
+ <h3>USER ATTRIBUTES</h3>
+
</c:if>
-<%--End of Portlets tab data--%>
+<%--End of User Attributes tab data--%>
-<%--Beginning of UserAttr tab data--%>
+<%--Beginning Security 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>
+<c:if test="${selectedTab.id == 'user_security'}">
+ <div id="Security">
</div>
+ <h3>SECURITY ATTRIBUTES</h3>
+
</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--%>
+<%--End of User check --%>
<br />
<br />
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
