[jboss-svn-commits] JBoss Portal SVN: r5422 - in trunk/core/src: bin/portal-core-war/themes/renaissance main/org/jboss/portal/core/portlet/role resources/portal-core-war/WEB-INF resources/portal-core-war/WEB-INF/classes resources/portal-core-war/WEB-INF/jsp/role resources/portal-core-war/WEB-INF/jsp/user
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Oct 11 13:45:56 EDT 2006
Author: roy.russo at jboss.com
Date: 2006-10-11 13:45:52 -0400 (Wed, 11 Oct 2006)
New Revision: 5422
Modified:
trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
trunk/core/src/main/org/jboss/portal/core/portlet/role/RolePortlet.java
trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties
trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_en.properties
trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties
trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties
trunk/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/menu.jsp
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp
Log:
JBPORTAL-1074 - ui/functionality enhancements to roleportlet.
Modified: trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
===================================================================
--- trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2006-10-11 15:17:18 UTC (rev 5421)
+++ trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2006-10-11 17:45:52 UTC (rev 5422)
@@ -1125,6 +1125,7 @@
padding-left: 16px;
}
+/*
a.addicondisabled {
font-weight: bold;
color: #d5d5d5;
@@ -1133,6 +1134,7 @@
background-position: left;
padding-left: 16px;
}
+*/
/************** Foat Style (used to float objects on the page) **********************/
Modified: trunk/core/src/main/org/jboss/portal/core/portlet/role/RolePortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/role/RolePortlet.java 2006-10-11 15:17:18 UTC (rev 5421)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/role/RolePortlet.java 2006-10-11 17:45:52 UTC (rev 5422)
@@ -156,6 +156,27 @@
{
DelegateContext ctx = new DelegateContext();
ctx.put("nbRoles", getNbRolesString(bundle));
+
+ DelegateContext roleCtx = null;
+ try
+ {
+ Set roles = roleModule.findRoles();
+ Iterator i = roles.iterator();
+ while (i.hasNext())
+ {
+ Role role = (Role)i.next();
+ roleCtx = ctx.next("role");
+ String roleId = role.getId().toString();
+ roleCtx.put("id", roleId);
+ roleCtx.put("displayname", role.getDisplayName());
+ }
+ }
+ catch (IdentityException e)
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
req.setAttribute(PortalJsp.CTX_REQUEST, ctx);
PortletRequestDispatcher rd = getPortletContext()
.getRequestDispatcher("/WEB-INF/jsp/role/menu.jsp");
@@ -398,12 +419,13 @@
}
}
- public void showListEditRoleMembers(JBossActionRequest req, JBossActionResponse resp)
+ public void showListEditRoleMembers(JBossActionRequest req, JBossActionResponse resp) throws WindowStateException
{
resp.setRenderParameter(getOperationName(), OP_SHOWLISTROLEMEMBERS);
resp.setRenderParameter("roleid", req.getParameter("roleid"));
resp.setRenderParameter("usersperpage", req.getParameter("usersperpage"));
resp.setRenderParameter("usernamefilter", req.getParameter("usernamefilter"));
+ resp.setWindowState(WindowState.MAXIMIZED);
}
/**
@@ -516,7 +538,7 @@
* @param req
* @param resp
*/
- public void editRole(JBossActionRequest req, JBossActionResponse resp)
+ public void editRole(JBossActionRequest req, JBossActionResponse resp) throws WindowStateException
{
if (req.isUserInRole(ADMIN_ROLE))
{
@@ -552,6 +574,7 @@
log.error("Cannot update role, unexpected error");
e.printStackTrace();
}
+ resp.setWindowState(WindowState.MAXIMIZED);
}
}
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2006-10-11 15:17:18 UTC (rev 5421)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2006-10-11 17:45:52 UTC (rev 5422)
@@ -277,6 +277,9 @@
MENU_EDITROLE=Edit existing role
MENU_EDITROLEMEMBERS=Edit role members
+ROLE_TEXT_1=Use this portlet to create, edit, delete and add users to roles.
+ROLE_TEXT_2=These roles are used in the Management Portlet to set access rights.
+
// CMS ADMIN PORTLET
TITLE_HEAD=CMS Admin
TITLE_BROWSE=Directory Browser
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_en.properties
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_en.properties 2006-10-11 15:17:18 UTC (rev 5421)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_en.properties 2006-10-11 17:45:52 UTC (rev 5422)
@@ -275,6 +275,9 @@
MENU_EDITROLE=Edit existing role
MENU_EDITROLEMEMBERS=Edit role members
+ROLE_TEXT_1=Use this portlet to create, edit, delete and add users to roles.
+ROLE_TEXT_2=These roles are used in the Management Portlet to set access rights.
+
// CMS ADMIN PORTLET
TITLE_HEAD=CMS Admin
TITLE_BROWSE=Directory Browser
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties 2006-10-11 15:17:18 UTC (rev 5421)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties 2006-10-11 17:45:52 UTC (rev 5422)
@@ -275,6 +275,9 @@
MENU_EDITROLE=Editar un rol existente
MENU_EDITROLEMEMBERS=Editar los miembros de un rol
+ROLE_TEXT_1=Use this portlet to create, edit, delete and add users to roles.
+ROLE_TEXT_2=These roles are used in the Management Portlet to set access rights.
+
// CMS ADMIN PORTLET
TITLE_HEAD=Administración de CMS
TITLE_BROWSE=Explorador de directorios
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties 2006-10-11 15:17:18 UTC (rev 5421)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties 2006-10-11 17:45:52 UTC (rev 5422)
@@ -245,6 +245,9 @@
MENU_CREATEROLE=Creer nouveau role
MENU_EDITROLE=Editer un role existant
+ROLE_TEXT_1=Use this portlet to create, edit, delete and add users to roles.
+ROLE_TEXT_2=These roles are used in the Management Portlet to set access rights.
+
// CMS ADMIN PORTLET
TITLE_HEAD=Administration CMS
TITLE_BROWSE=Navigation repertoires
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml 2006-10-11 15:17:18 UTC (rev 5421)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml 2006-10-11 17:45:52 UTC (rev 5422)
@@ -7,6 +7,19 @@
</portlet>
<portlet>
<portlet-name>RolePortlet</portlet-name>
+ <header-content>
+ <script type="text/javascript" language="javascript">
+ function hideShow(id)
+ {
+ var navpoint = document.getElementById(id);
+ if (navpoint.className == 'hidden') {
+ navpoint.className = 'shown';
+ } else {
+ navpoint.className = 'hidden';
+ }
+ }
+ </script>
+ </header-content>
<transaction>
<trans-attribute>Required</trans-attribute>
</transaction>
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/menu.jsp
===================================================================
(Binary files differ)
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp 2006-10-11 15:17:18 UTC (rev 5421)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp 2006-10-11 17:45:52 UTC (rev 5422)
@@ -2,6 +2,7 @@
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
<%@ page isELIgnored="false" %>
+<portlet:defineObjects/>
<p>${n:i18n("LIST_SEARCHRESULTS")} "${n:out("usernamefilter")}" (${n:out("results")} ${n:i18n("LIST_MATCHING")})</p>
@@ -87,4 +88,15 @@
<span class="portlet-font"><a
href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showMenu"/></portlet:renderURL>">${n:i18n("Cancel")}</a></span>
</form>
+<br/>
+<a id="register"
+ href="<portlet:renderURL windowState="maximized"><portlet:param name="op" value="showRegister"/></portlet:renderURL>"><img
+ src="<%= renderRequest.getContextPath() %>/images/user/ico_adduser.gif" border="0"
+ align="absmiddle"/></a> <a
+id="register"
+href="
+<portlet:renderURL windowState="maximized">
+ <portlet:param name="op" value="showRegister"/>
+</portlet:renderURL>
+">${n:i18n("REGISTER_REGISTER_ADMIN_LINK")}</a>
</div>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list