You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2005/12/06 20:49:23 UTC
svn commit: r354525 [2/2] - in /portals/jetspeed-2/trunk:
applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/
applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/groups/
applications/j2-admin/src/java/org/apache/jetsp...
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/roles/role-details.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/roles/role-details.vm?rev=354525&r1=354524&r2=354525&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/roles/role-details.vm (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/roles/role-details.vm Tue Dec 6 11:48:58 2005
@@ -23,10 +23,10 @@
<script>
function openWindow(pipeline)
-{
+{
var vWinUsers = window.open(pipeline, 'UserPicker', 'status=no,resizable=yes,width=200,height=300,scrollbars=yes');
vWinUsers.opener = self;
- vWinUsers.focus();
+ vWinUsers.focus();
}
</script>
@@ -36,6 +36,9 @@
#if ($statusMsg)
#parse ('/WEB-INF/view/status-include.vm')
#end
+#if ($errorMessages)
+#parse ('/WEB-INF/view/errors-include.vm')
+#end
#if ($role)
#set ($newRole = "false")
#else
@@ -58,23 +61,21 @@
#if ($newRole == "true")
<input type="submit" name="role.action.Save" value="$MESSAGES.getString('save')" class="portlet-form-button"/>
#end
-</form>
+</form>
#if ($newRole == "false")
<form name='usersInRoleForm' action="$formAction" method="post">
<table cellpadding=0 cellspacing=1 border=0 width='100%' >
-#if ($tableSize > 0)
- <input type="hidden" name="role" value="$!role">
- <input type="submit" id="removeCheckedUsers" name="role.action.Remove_Checked_Users" value="$MESSAGES.getString('removecheckedusers')" style="display:none"/>
+ <input type="hidden" name="role" value="$!role">
+ <input type="submit" id="removeCheckedUsers" name="role.action.Remove_Checked_Users" value="$MESSAGES.getString('removecheckedusers')" style="display:none"/>
<tr>
#foreach ($column in $title)
<th width="10"></th>
<th align='center' class="portlet-section-header" nowrap width="100%">
- $column
+ $MESSAGES.getString("$column")
</th>
#end
</tr>
-#end
#foreach ( $user in $table )
<tr>
#if ($velocityCount % 2 == 0)
@@ -85,15 +86,14 @@
<td class="$rowstyle" width="10">
<input type="checkbox" name="box_$user"/>
</td>
- <td class="$rowstyle" nowrap width="100%">
- <div align="center">$user</div>
- </td>
+ <td class="$rowstyle" nowrap width="100%">
+ <div align="center">$user</div>
+ </td>
</tr>
#end
</table>
</form>
-#if ($tableSize > 0)
<hr/>
<!-- controls -->
@@ -186,7 +186,6 @@
</tr>
</table>
</form>
-#end
<form name="securityform" action="$formAction" method="post">
<table>
Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/roles/role-multi-chooser.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/roles/role-multi-chooser.vm?rev=354525&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/roles/role-multi-chooser.vm (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/roles/role-multi-chooser.vm Tue Dec 6 11:48:58 2005
@@ -0,0 +1,93 @@
+#*
+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.
+*#
+
+#**
+
+@author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+@version $Id: user-multi-chooser.vm 348264 2005-11-22 22:06:45Z taylor $
+
+*#
+
+<script language="JavaScript" type="text/javascript">
+ <!--
+ function select(value)
+ {
+ var openerForm = opener.document.forms['securityform'];
+ var openerEl = openerForm.elements['roles'];
+ window.close();
+ }
+ function rowHover(row)
+ {
+ row.oldClassName = row.className;
+ row.className = 'jetdbLight';
+ row.onmouseout = function()
+ {
+ this.className = this.oldClassName;
+ }
+ }
+ function sendChecks(form)
+ {
+ var result = "";
+ for(var i = 0; i < form.length; i++)
+ {
+ var e = form.elements[i];
+ if (e.type == "checkbox")
+ {
+ if (e.checked == true)
+ {
+ result = result + "," + e.name;
+ }
+ }
+ }
+ var openerForm = opener.document.forms['securityform'];
+ var openerEl = openerForm.elements['roles'];
+ openerEl.value = result;
+ window.close();
+ openerForm.submit();
+ }
+ //-->
+</script>
+
+
+#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
+<form name='roleform' onSubmit='sendChecks(this)'/>
+<table cellpadding=0 cellspacing=1 border=0 width='100%' >
+ <tr>
+ #foreach ($column in $title)
+ <td align='center' class="jetdbHeadNoLink" width="90%" nowrap>
+ $column
+ </td>
+ <th class="jetdbHeadNoLink" width="10"></th>
+ #end
+ </tr>
+ #foreach ( $role in $table )
+ <tr>
+ #if ($velocityCount % 2 == 0)
+ #set($rowstyle = "jetdbEven")
+ #else
+ #set($rowstyle = "jetdbOdd")
+ #end
+ <td class="$rowstyle" nowrap width="90%" onmouseover="rowHover(this)">
+ <div align="center">$role</div>
+ </td>
+ <td class="$rowstyle" width="10">
+ <input type="checkbox" name="box_$role"/>
+ </td>
+ </tr>
+ #end
+</table>
+ <input type="submit" name="add.roles" value="Add Roles" class="jetdbButton" />
+</form>
\ No newline at end of file
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/roles/roles-view.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/roles/roles-view.vm?rev=354525&r1=354524&r2=354525&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/roles/roles-view.vm (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/roles/roles-view.vm Tue Dec 6 11:48:58 2005
@@ -6,13 +6,16 @@
#if ($statusMsg)
#parse ('/WEB-INF/view/status-include.vm')
#end
+#if ($errorMessages)
+#parse ('/WEB-INF/view/errors-include.vm')
+#end
<table cellpadding=0 cellspacing=1 border=0 width='100%' >
<tr>
<th width='12'></th>
#foreach ($column in $title)
<th align='center' class="portlet-section-header" width="100%" nowrap>
- $column
+ $MESSAGES.getString("$column")
</th>
#end
</tr>
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/users/user-browser.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/users/user-browser.vm?rev=354525&r1=354524&r2=354525&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/users/user-browser.vm (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/users/user-browser.vm Tue Dec 6 11:48:58 2005
@@ -28,13 +28,16 @@
#if ($statusMsg)
#parse ('/WEB-INF/view/status-include.vm')
#end
+#if ($errorMessages)
+#parse ('/WEB-INF/view/errors-include.vm')
+#end
<table cellpadding=0 cellspacing=1 border=0 width='100%' >
<tr>
<th width='12'></th>
#foreach ($column in $title)
<th align='center' class="portlet-section-header" width="100%" nowrap>
- $column
+ $MESSAGES.getString("$column")
</th>
#end
</tr>
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/users/user-details-edit.jsp
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/users/user-details-edit.jsp?rev=354525&r1=354524&r2=354525&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/users/user-details-edit.jsp (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/users/user-details-edit.jsp Tue Dec 6 11:48:58 2005
@@ -26,11 +26,7 @@
<script language="JavaScript">function t(i,f){if(i.checked) f.value='true';else f.value='false';}</script>
<h3 class="portlet-section-header">User Detail Preferences</h3>
<c:if test="${errorMessages != null}">
- <ul>
- <c:forEach items="${errorMessages}" var="error">
- <li style="color:red"><c:out value="${error}"/></li>
- </c:forEach>
- </ul>
+ <jsp:include page="/WEB-INF/view/errors-include.jsp"/>
</c:if>
<form action="<portlet:actionURL/>" method="post">
<c:set var="prefs" value="${renderRequest.preferences.map}"/>
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/users/user-details.jsp
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/users/user-details.jsp?rev=354525&r1=354524&r2=354525&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/users/user-details.jsp (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/users/user-details.jsp Tue Dec 6 11:48:58 2005
@@ -63,11 +63,7 @@
<portlet:actionURL var="edit_user_link" />
<c:if test="${errorMessages != null}">
- <ul>
- <c:forEach items="${errorMessages}" var="error">
- <li style="color:red"><c:out value="${error}"/></li>
- </c:forEach>
- </ul>
+ <jsp:include page="/WEB-INF/view/errors-include.jsp"/>
</c:if>
<form name="Edit_UserAttr_Form" action="<c:out value="${edit_user_link}"/>" method="post">
@@ -200,11 +196,7 @@
<portlet:actionURL var="edit_user_attr_link" />
<c:if test="${errorMessages != null}">
- <ul>
- <c:forEach items="${errorMessages}" var="error">
- <li style="color:red"><c:out value="${error}"/></li>
- </c:forEach>
- </ul>
+ <jsp:include page="/WEB-INF/view/errors-include.jsp"/>
</c:if>
<form name="Edit_UserAttr_Form" action="<c:out value="${edit_user_attr_link}"/>" method="post">
@@ -269,11 +261,7 @@
<portlet:actionURL var="edit_credential_link" />
<c:if test="${errorMessages != null}">
- <ul>
- <c:forEach items="${errorMessages}" var="error">
- <li style="color:red"><c:out value="${error}"/></li>
- </c:forEach>
- </ul>
+ <jsp:include page="/WEB-INF/view/errors-include.jsp"/>
</c:if>
<form name="Edit_Credential_Form" action="<c:out value="${edit_credential_link}"/>" method="post">
@@ -372,11 +360,7 @@
<portlet:actionURL var="edit_role_link" />
<c:if test="${errorMessages != null}">
- <ul>
- <c:forEach items="${errorMessages}" var="error">
- <li style="color:red"><c:out value="${error}"/></li>
- </c:forEach>
- </ul>
+ <jsp:include page="/WEB-INF/view/errors-include.jsp"/>
</c:if>
<form name="Edit_Role_Form" action="<c:out value="${edit_role_link}"/>" method="post">
@@ -433,11 +417,7 @@
<portlet:actionURL var="edit_group_link" />
<c:if test="${errorMessages != null}">
- <ul>
- <c:forEach items="${errorMessages}" var="error">
- <li style="color:red"><c:out value="${error}"/></li>
- </c:forEach>
- </ul>
+ <jsp:include page="/WEB-INF/view/errors-include.jsp"/>
</c:if>
<form name="Edit_Group_Form" action="<c:out value="${edit_group_link}"/>" method="post">
@@ -495,11 +475,7 @@
<portlet:actionURL var="edit_profile_link" />
<c:if test="${errorMessages != null}">
- <ul>
- <c:forEach items="${errorMessages}" var="error">
- <li style="color:red"><c:out value="${error}"/></li>
- </c:forEach>
- </ul>
+ <jsp:include page="/WEB-INF/view/errors-include.jsp"/>
</c:if>
<form name="Edit_Profile_Form" action="<c:out value="${edit_profile_link}"/>" method="post">
@@ -588,11 +564,7 @@
<h3 class="portlet-section-header"><fmt:message key="security.add.user"/></h3>
<c:if test="${errorMessages != null}">
- <ul>
- <c:forEach items="${errorMessages}" var="error">
- <li style="color:red"><c:out value="${error}"/></li>
- </c:forEach>
- </ul>
+ <jsp:include page="/WEB-INF/view/errors-include.jsp"/>
</c:if>
<div class="portlet-section-text">
Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/errors-include.jsp
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/errors-include.jsp?rev=354525&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/errors-include.jsp (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/errors-include.jsp Tue Dec 6 11:48:58 2005
@@ -0,0 +1,22 @@
+<%--
+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.
+--%>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+ <br/>
+ <table width="100%" cellpadding="0" cellspacing="0" border="0">
+ <c:forEach items="${errorMessages}" var="error">
+ <tr>
+ <td class="portlet-msg-error"><c:out value="${error}"/></td>
+ </tr>
+ </c:forEach>
+ </table>
+
Added: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/errors-include.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/errors-include.vm?rev=354525&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/errors-include.vm (added)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/errors-include.vm Tue Dec 6 11:48:58 2005
@@ -0,0 +1,23 @@
+#*
+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.
+*#
+<br/>
+<table width="100%" cellpadding="0" cellspacing="0" border="0">
+#foreach ($errorMsg in $errorMessages )
+<tr>
+ <td class="portlet-msg-error">$errorMsg</td>
+</tr>
+</table>
+#end
\ No newline at end of file
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/choosers/multiroles.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/choosers/multiroles.psml?rev=354525&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/choosers/multiroles.psml (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/Administrative/choosers/multiroles.psml Tue Dec 6 11:48:58 2005
@@ -0,0 +1,24 @@
+<!--
+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 id="multi-chooser-roles" hidden='true'>
+ <defaults
+ layout-decorator="simple"
+ portlet-decorator="clear"
+ />
+ <title>User Chooser</title>
+
+ <fragment id="mchooser-roles" type="layout" name="jetspeed-layouts::VelocityOneColumnNoActions">
+ <fragment id="mchooser-roles-1" type="portlet" name="j2-admin::RoleMultiChooser" >
+ </fragment>
+ </fragment>
+</page>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org