JBoss Portal SVN: r7298 - in trunk/core/src/resources/portal-core-war/WEB-INF: jsp/role and 1 other directory.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-05-21 10:49:48 -0400 (Mon, 21 May 2007)
New Revision: 7298
Modified:
trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/menu.jsp
Log:
JBPORTAL-1418 Deleting a role should have a confirmation before deletion.
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 2007-05-21 14:41:34 UTC (rev 7297)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2007-05-21 14:49:48 UTC (rev 7298)
@@ -261,7 +261,7 @@
LIST_ACTIONADDROLESTOUSER=Roles
LIST_ACTIONEDITROLES=Edit Roles
LIST_ACTIONDELETEUSER=Delete user
-LIST_CONFIRMDELETEUSER=You are about to delete a user?
+LIST_CONFIRMDELETEUSER=You are about to delete a user
LIST_SEARCHRESULTS=Search results for
LIST_MATCHING=Matching Users
FILTER=Filter
@@ -288,6 +288,7 @@
ROLE_UPDATE=Update user role
ROLE_EDIT=Edit user role
ROLE_DELETE=Delete selected role
+ROLE_CONFIRM_DELETE=You are about to delete a role
ROLE_DELETED=The role has been deleted
ROLE_EDIT_MEMBERS=Edit role members
ROLE_MAINLIST=Back to Role Edit
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/menu.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/menu.jsp 2007-05-21 14:41:34 UTC (rev 7297)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/menu.jsp 2007-05-21 14:49:48 UTC (rev 7298)
@@ -28,7 +28,8 @@
<td nowrap class="portlet-table-text"><a href="<portlet:actionURL>
<portlet:param name="op" value="removeRole"/>
<portlet:param name="roleid" value="${n:out('role.id')}"/>
- </portlet:actionURL>">Delete</a></td>
+ </portlet:actionURL>"
+ onClick="javascript:return confirm('${n:i18n("ROLE_CONFIRM_DELETE")}')">Delete</a></td>
</tr>
</n:iterate>
</table>
17 years
JBoss Portal SVN: r7297 - in trunk/core/src/resources/portal-core-war/WEB-INF: jsp/user and 1 other directory.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-05-21 10:41:34 -0400 (Mon, 21 May 2007)
New Revision: 7297
Modified:
trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp
Log:
JBPORTAL-1430 The "Delete user" action should prompt for comfirmation.
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 2007-05-21 14:25:58 UTC (rev 7296)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2007-05-21 14:41:34 UTC (rev 7297)
@@ -261,6 +261,7 @@
LIST_ACTIONADDROLESTOUSER=Roles
LIST_ACTIONEDITROLES=Edit Roles
LIST_ACTIONDELETEUSER=Delete user
+LIST_CONFIRMDELETEUSER=You are about to delete a user?
LIST_SEARCHRESULTS=Search results for
LIST_MATCHING=Matching Users
FILTER=Filter
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 2007-05-21 14:25:58 UTC (rev 7296)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp 2007-05-21 14:41:34 UTC (rev 7297)
@@ -28,7 +28,9 @@
<td nowrap="nowrap" class="${n:out("row.cssClass")}"><a
href="${n:out("row.editURL")}">${n:i18n("LIST_ACTIONSSHOWPROFILE")}</a> | <a
href="${n:out("row.rolesURL")}">${n:i18n("LIST_ACTIONADDROLESTOUSER")}</a> | <a
- href="${n:out("row.deleteURL")}">${n:i18n("LIST_ACTIONDELETEUSER")}</a></td>
+ href="${n:out("row.deleteURL")}"
+ onClick="javascript:return confirm('${n:i18n("LIST_CONFIRMDELETEUSER")}')"
+ >${n:i18n("LIST_ACTIONDELETEUSER")}</a></td>
</tr>
</n:iterate>
</table>
17 years
JBoss Portal SVN: r7296 - trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-05-21 10:25:58 -0400 (Mon, 21 May 2007)
New Revision: 7296
Modified:
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser.jsp
Log:
JBPORTAL-1427 There should be a cancel button to allow you to exit without creating a user.
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp 2007-05-21 13:50:47 UTC (rev 7295)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp 2007-05-21 14:25:58 UTC (rev 7296)
@@ -7,7 +7,7 @@
<p><span class="requiredfield">*</span> ${n:i18n("REQUIRED")}</p>
<hr/>
<table width="100%" cellpadding="0" cellspacing="10" border="0" class="pn-normal">
- <form name="register"
+ <form name="<portlet:namespace/>register"
action="<portlet:actionURL><portlet:param name="op" value="userRegister"/></portlet:actionURL>" method="post">
<tr>
<td colspan="3" nowrap><h4>${n:i18n("REGISTER_BASICINFO")}</h4></td>
@@ -46,25 +46,40 @@
<td class="portlet-form-label" nowrap>${n:i18n("REGISTER_PASSWORDAGAIN")}<span
class="requiredfield">*</span></td>
<td colspan="2"><input type="password" name="pass2" size="30" maxlength="20">
- <n:error key="pass2_error"/>
+ <n:error key="pass2_error"/>
</td>
</tr>
- <tr>
- <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_QUESTION")}</td>
+ <tr>
+ <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_QUESTION")}</td>
- <td class="pn-normal" colspan="2"><input type="text" name="question" value="" size="30" maxlength="100">
- </td>
- </tr>
- <tr>
- <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_ANSWER")}</td>
- <td class="pn-normal" colspan="2"><input type="text" name="answer" value="" size="30" maxlength="100">
- </td>
- </tr>
- <tr>
+ <td class="pn-normal" colspan="2"><input type="text" name="question" value="" size="30" maxlength="100">
+ </td>
+ </tr>
+ <tr>
+ <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_ANSWER")}</td>
+ <td class="pn-normal" colspan="2"><input type="text" name="answer" value="" size="30" maxlength="100">
+ </td>
+ </tr>
+ <%--<tr>
<td colspan="3" class="bottombuttonbar">
<input name="register" type="submit" class="portlet-form-button"
value="${n:i18n("REGISTER_NEWUSER")}"/>
</td>
- </tr>
+ </tr>--%>
</form>
+ <form
+ name="<portlet:namespace/>cancel"
+ method="post"
+ action="<portlet:renderURL windowState="normal"/>"/>
+ <tr>
+ <td colspan="3" class="bottombuttonbar">
+ <input name="Save" class="portlet-form-button" id="register" type="submit"
+ onclick="document.forms['<portlet:namespace/>register'].submit();"
+ value="${n:i18n("REGISTER_NEWUSER")}"/>
+
+ <input name="Cancel" class="portlet-form-button" id="Cancel" type="submit"
+ onclick="document.forms['<portlet:namespace/>cancel'].submit();"
+ value="${n:i18n("Cancel")}"/>
+ </td>
+ </tr>
</table>
\ No newline at end of file
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser.jsp 2007-05-21 13:50:47 UTC (rev 7295)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser.jsp 2007-05-21 14:25:58 UTC (rev 7296)
@@ -13,7 +13,7 @@
<p><span class="requiredfield">*</span> ${n:i18n("REQUIRED")}</p>
<hr/>
<table width="100%" cellpadding="0" cellspacing="10" border="0" class="pn-normal">
- <form name="register"
+ <form name="<portlet:namespace/>register"
action="<portlet:actionURL><portlet:param name="op" value="userRegister"/></portlet:actionURL>" method="post">
<tr>
<td colspan="3" nowrap><h4>${n:i18n("REGISTER_BASICINFO")}</h4></td>
@@ -56,10 +56,26 @@
</td>
</tr>
<tr>
- <td colspan="3" class="bottombuttonbar">
+ <%--<td colspan="3" class="bottombuttonbar">
<input name="register" type="submit" class="portlet-form-button"
value="${n:i18n("REGISTER_NEWUSER")}"/>
- </td>
+ </td>--%>
</tr>
</form>
+ <form
+ name="<portlet:namespace/>cancel"
+ method="post"
+ action="<portlet:renderURL windowState="normal"/>"/>
+ <tr>
+ <td colspan="3" class="bottombuttonbar">
+ <input name="Save" class="portlet-form-button" id="register" type="submit"
+ onclick="document.forms['<portlet:namespace/>register'].submit();"
+ value="${n:i18n("REGISTER_NEWUSER")}"/>
+
+ <input name="Cancel" class="portlet-form-button" id="Cancel" type="submit"
+ onclick="document.forms['<portlet:namespace/>cancel'].submit();"
+ value="${n:i18n("Cancel")}"/>
+ </td>
+ </tr>
+
</table>
\ No newline at end of file
17 years
JBoss Portal SVN: r7295 - trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-05-21 09:50:47 -0400 (Mon, 21 May 2007)
New Revision: 7295
Modified:
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editListRoleMembers.jsp
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editRole.jsp
Log:
JBPORTAL-1424 In 'Members' view the cancel link should be a button styled similarly to the "Save Changes" button, with a slight amount of spacing between the two buttons. The label "Edit role members" above the box to type a user to search for is a bit misleading. This label should be changed to "Role member".
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editListRoleMembers.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editListRoleMembers.jsp 2007-05-21 13:44:21 UTC (rev 7294)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editListRoleMembers.jsp 2007-05-21 13:50:47 UTC (rev 7295)
@@ -54,6 +54,7 @@
<br/>
<form
+ name="<portlet:namespace/>editListRoleMembers"
action="<portlet:actionURL><portlet:param name="op" value="showListEditRoleMembers"/></portlet:actionURL>"
method="post">
<font class="portlet-form-label">${n:i18n("MENU_EDITROLEMEMBERS")}</font><br/>
@@ -72,9 +73,17 @@
<option value="100">100</option>
</select>
<br/>
- <input name="Find" type="submit" class="portlet-form-button" id="Find"
- value="${n:i18n("Search")}"/>
- <span class="portlet-font"><a
- href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showSummary"/></portlet:renderURL>">${n:i18n("Cancel")}</a></span>
</form>
-
+<form
+ name="<portlet:namespace/>cancelEditListRoleMembers"
+ action="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showSummary"/></portlet:renderURL>"
+ method="post"/>
+<p>
+<input name="Find" class="portlet-form-button" id="Save" type="submit"
+ onclick="document.forms['<portlet:namespace/>editListRoleMembers'].submit();"
+ value="${n:i18n("Search")}"/>
+
+<input name="Cancel" class="portlet-form-button" id="Cancel" type="submit"
+ onclick="document.forms['<portlet:namespace/>cancelEditListRoleMembers'].submit();"
+ value="${n:i18n("Cancel")}"/>
+</p>
\ No newline at end of file
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editRole.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editRole.jsp 2007-05-21 13:44:21 UTC (rev 7294)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editRole.jsp 2007-05-21 13:50:47 UTC (rev 7295)
@@ -24,11 +24,11 @@
<input name="Save" class="portlet-form-button" id="Save" type="submit"
onclick="document.forms['<portlet:namespace/>editRole'].submit();"
value="${n:i18n("SaveChanges")}"/>
+
<input name="Cancel" class="portlet-form-button" id="Cancel" type="submit"
onclick="document.forms['<portlet:namespace/>cancelEditRole'].submit();"
value="${n:i18n("Cancel")}"/>
</p>
-
</div>
17 years
JBoss Portal SVN: r7294 - in trunk/core-admin/src: resources/portal-admin-war/WEB-INF/jsf and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-05-21 09:44:21 -0400 (Mon, 21 May 2007)
New Revision: 7294
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml
Log:
JBPORTAL-1451: If the portlet instance has no Preferences, do not show the Preferences link for it.
Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2007-05-21 13:30:40 UTC (rev 7293)
+++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2007-05-21 13:44:21 UTC (rev 7294)
@@ -26,6 +26,7 @@
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -39,6 +40,7 @@
import org.jboss.portal.common.value.Value;
import org.jboss.portal.core.model.instance.Instance;
import org.jboss.portal.core.model.instance.InstanceContainer;
+import org.jboss.portal.core.model.instance.InstanceDefinition;
import org.jboss.portal.core.model.instance.NoSuchInstanceException;
import org.jboss.portal.identity.RoleModule;
import org.jboss.portal.portlet.PortletInvokerException;
@@ -250,6 +252,27 @@
return list.subList(selectedFrom, to);
}
+ /** Return an array of all instances known in this container. */
+ public Map getSelectedInstancesPrefs()
+ {
+ Map map = new HashMap();
+ Collection instances = getSelectedInstances();
+ Iterator it = instances.iterator();
+
+ while (it.hasNext())
+ {
+ InstanceDefinition instanceDef = (InstanceDefinition)it.next();
+ try {
+ map.put(instanceDef.getId(), instanceDef.getProperties());
+ } catch (PortletInvokerException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ return map;
+ }
+
public int getInstanceCount()
{
return getInstances().size();
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-05-21 13:30:40 UTC (rev 7293)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-05-21 13:44:21 UTC (rev 7294)
@@ -30,16 +30,15 @@
<f:param name="plugin" value="info"/>
</h:commandLink>
</td>
- <td>
- <h:commandLink action="#{instancemgr.selectInstance}">
- <h:outputText value="Preferences"/>
- <f:param name="id" value="#{instance.id}"/>
- <f:param name="plugin" value="preferences"/>
- </h:commandLink> | <h:commandLink action="#{instancemgr.selectInstance}">
+ <td><h:commandLink action="#{instancemgr.selectInstance}">
<h:outputText value="Security"/>
<f:param name="id" value="#{instance.id}"/>
<f:param name="plugin" value="security"/>
- </h:commandLink> | <h:commandLink action="#{instancemgr.deleteInstance}">
+ </h:commandLink> | <h:panelGroup rendered="#{! empty(instancemgr.selectedInstancesPrefs[instance.id])}"><h:commandLink action="#{instancemgr.selectInstance}">
+ <h:outputText value="Preferences"/>
+ <f:param name="id" value="#{instance.id}"/>
+ <f:param name="plugin" value="preferences"/>
+ </h:commandLink> | </h:panelGroup><h:commandLink action="#{instancemgr.deleteInstance}">
<h:outputText value="Destroy"/>
<f:param name="id" value="#{instance.id}"/>
</h:commandLink>
17 years
JBoss Portal SVN: r7293 - in trunk/core/src/resources/portal-core-war/WEB-INF: jsp/role and 1 other directory.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-05-21 09:30:40 -0400 (Mon, 21 May 2007)
New Revision: 7293
Modified:
trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editRole.jsp
Log:
JBPORTAL-1422 In 'Edit exisitng Role' view the cancel link should be a button styled similarly to the "Save Changes" button, with a slight amount of spacing between the two buttons.
JBPORTAL-1419 In 'Edit exisitng Role' view label for role display name field should be to the left of the field with a colon after it. There should be some space between the label and field.
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 2007-05-21 12:17:37 UTC (rev 7292)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2007-05-21 13:30:40 UTC (rev 7293)
@@ -300,7 +300,7 @@
MENU_CREATEROLE=Create new role
MENU_EDITROLE=Edit existing role
-MENU_EDITROLEMEMBERS=Edit role members
+MENU_EDITROLEMEMBERS=Role member
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.
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editRole.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editRole.jsp 2007-05-21 12:17:37 UTC (rev 7292)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editRole.jsp 2007-05-21 13:30:40 UTC (rev 7293)
@@ -7,21 +7,28 @@
<div>
<h6>${n:i18n("MENU_EDITROLE")}: ${n:out("editroledisplayname")}</h6>
- <form name="editRole"
+ <form name="<portlet:namespace/>editRole"
action="<portlet:actionURL><portlet:param name="op" value="editRole"/></portlet:actionURL>" method="post">
<input type="hidden" name="roleid" value="${n:out("editroleid")}"/>
<p>
- <label class="portlet-form-label">${n:i18n("ROLE_DISPLAYNAME")}</label>
- <br/>
+ <label class="portlet-form-label">${n:i18n("ROLE_DISPLAYNAME")}: </label>
<input name="roledisplayname" type="text" value="${param["editroledisplayname"]}" size="21" maxlength="25"/>
<n:error key="roledisplayname_error"/>
</p>
+ </form>
+ <form name="<portlet:namespace/>cancelEditRole"
+ action="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showSummary"/></portlet:renderURL>" method="post">
+ </form>
+ <p>
+ <input name="Save" class="portlet-form-button" id="Save" type="submit"
+ onclick="document.forms['<portlet:namespace/>editRole'].submit();"
+ value="${n:i18n("SaveChanges")}"/>
+ <input name="Cancel" class="portlet-form-button" id="Cancel" type="submit"
+ onclick="document.forms['<portlet:namespace/>cancelEditRole'].submit();"
+ value="${n:i18n("Cancel")}"/>
+ </p>
- <p><input name="Save" type="submit" class="portlet-form-button" id="Save"
- value="${n:i18n("SaveChanges")}"/>
- <span class="portlet-font"><a
- href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showSummary"/></portlet:renderURL>">${n:i18n("Cancel")}</a></span>
- </p>
- </form>
</div>
+
+
17 years
JBoss Portal SVN: r7292 - in trunk/core/src/main/org/jboss/portal/core: model/portal and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-05-21 08:17:37 -0400 (Mon, 21 May 2007)
New Revision: 7292
Modified:
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ContextImpl.java
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/DashboardContext.java
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java
trunk/core/src/main/org/jboss/portal/core/model/portal/PortalContainer.java
trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java
Log:
minor update of DashboardContext class
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ContextImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ContextImpl.java 2007-05-21 11:41:17 UTC (rev 7291)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ContextImpl.java 2007-05-21 12:17:37 UTC (rev 7292)
@@ -78,22 +78,22 @@
return null;
}
- public PortalContainer createPortalContainer(String name) throws DuplicatePortalObjectException
- {
- ContextImpl portalContainer = new ContextImpl(false);
- addChild(name, portalContainer);
- return portalContainer;
- }
+// public PortalContainer createPortalContainer(String name) throws DuplicatePortalObjectException
+// {
+// ContextImpl portalContainer = new ContextImpl(false);
+// addChild(name, portalContainer);
+// return portalContainer;
+// }
- public PortalContainer getPortalContainer(String name) throws IllegalArgumentException
- {
- PortalObject child = getChild(name);
- if (child instanceof PortalContainer)
- {
- return (PortalContainer)child;
- }
- return null;
- }
+// public PortalContainer getPortalContainer(String name) throws IllegalArgumentException
+// {
+// PortalObject child = getChild(name);
+// if (child instanceof PortalContainer)
+// {
+// return (PortalContainer)child;
+// }
+// return null;
+// }
public int getType()
{
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/DashboardContext.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/DashboardContext.java 2007-05-21 11:41:17 UTC (rev 7291)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/DashboardContext.java 2007-05-21 12:17:37 UTC (rev 7292)
@@ -22,23 +22,138 @@
******************************************************************************/
package org.jboss.portal.core.impl.model.portal;
+import org.jboss.portal.core.model.portal.Context;
+
+import java.util.Collection;
+
/**
+ * An implementation of the <code>Context</code> interface for dashboards.
+ *
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-public class DashboardContext
+public abstract class DashboardContext implements Context
{
- /** . */
- private final String id;
- public DashboardContext(String id)
+
+
+
+ public Collection getChildren()
{
- this.id = id;
+ throw new UnsupportedOperationException();
}
- public String getId()
+ public Collection getChildren(int mask)
{
- return id;
+ throw new UnsupportedOperationException();
}
+
+
+
+//
+// public Portal getPortal(String name) throws IllegalArgumentException
+// {
+// return null; //To change body of implemented methods use File | Settings | File Templates.
+// }
+//
+// public Portal createPortal(String name) throws DuplicatePortalObjectException, IllegalArgumentException
+// {
+// return null; //To change body of implemented methods use File | Settings | File Templates.
+// }
+//
+// public Portal getDefaultPortal()
+// {
+// return null; //To change body of implemented methods use File | Settings | File Templates.
+// }
+//
+// public PortalContainer getPortalContainer(String name) throws IllegalArgumentException
+// {
+// return null; //To change body of implemented methods use File | Settings | File Templates.
+// }
+//
+// public PortalContainer createPortalContainer(String name) throws DuplicatePortalObjectException, IllegalArgumentException
+// {
+// return null; //To change body of implemented methods use File | Settings | File Templates.
+// }
+//
+// public PortalObjectId getId()
+// {
+// return null; //To change body of implemented methods use File | Settings | File Templates.
+// }
+//
+// public int getType()
+// {
+// return 0; //To change body of implemented methods use File | Settings | File Templates.
+// }
+//
+// public String getName()
+// {
+// return null; //To change body of implemented methods use File | Settings | File Templates.
+// }
+//
+// public String getListener()
+// {
+// return null; //To change body of implemented methods use File | Settings | File Templates.
+// }
+//
+// public void setListener(String listener)
+// {
+// //To change body of implemented methods use File | Settings | File Templates.
+// }
+//
+// public Collection getChildren()
+// {
+// return null; //To change body of implemented methods use File | Settings | File Templates.
+// }
+//
+// public Collection getChildren(int mask)
+// {
+// return null; //To change body of implemented methods use File | Settings | File Templates.
+// }
+//
+// public PortalObject getParent()
+// {
+// return null; //To change body of implemented methods use File | Settings | File Templates.
+// }
+//
+// public PortalObject getChild(String name)
+// {
+// return null; //To change body of implemented methods use File | Settings | File Templates.
+// }
+//
+// public void destroyChild(String name) throws NoSuchPortalObjectException, IllegalArgumentException
+// {
+// //To change body of implemented methods use File | Settings | File Templates.
+// }
+//
+// public PortalObject copy(PortalObject parent, String name, boolean deep) throws DuplicatePortalObjectException, IllegalArgumentException
+// {
+// return null; //To change body of implemented methods use File | Settings | File Templates.
+// }
+//
+// public String getProperty(String name) throws IllegalArgumentException
+// {
+// return null; //To change body of implemented methods use File | Settings | File Templates.
+// }
+//
+// public Map getProperties()
+// {
+// return null; //To change body of implemented methods use File | Settings | File Templates.
+// }
+//
+// public String getDeclaredProperty(String name) throws IllegalArgumentException
+// {
+// return null; //To change body of implemented methods use File | Settings | File Templates.
+// }
+//
+// public void setDeclaredProperty(String name, String value) throws IllegalArgumentException
+// {
+// //To change body of implemented methods use File | Settings | File Templates.
+// }
+//
+// public Map getDeclaredProperties()
+// {
+// return null; //To change body of implemented methods use File | Settings | File Templates.
+// }
}
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2007-05-21 11:41:17 UTC (rev 7291)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2007-05-21 12:17:37 UTC (rev 7292)
@@ -69,7 +69,7 @@
private Map childrenMap;
private Map properties;
private Map unmodifiableProperties;
- private DashboardContext dashboardContext;
+// private DashboardContext dashboardContext;
public PortalObjectImpl()
{
@@ -438,10 +438,10 @@
return (String)properties.get(name);
}
- public final boolean isDashboard()
- {
- return getDashboardContext() != null;
- }
+// public final boolean isDashboard()
+// {
+// return getDashboardContext() != null;
+// }
public abstract int getType();
@@ -514,33 +514,33 @@
}
}
- protected final DashboardContext getDashboardContext()
- {
- if (dashboardContext == null)
- {
- // Get parent object
- PortalObjectImpl parent = (PortalObjectImpl)getParent();
+// protected final DashboardContext getDashboardContext()
+// {
+// if (dashboardContext == null)
+// {
+// // Get parent object
+// PortalObjectImpl parent = (PortalObjectImpl)getParent();
+//
+// // We need the parent to find out the context details
+// if (this instanceof ContextImpl)
+// {
+// String dashboard = getDeclaredProperty("dashboard");
+// if ("true".equals(dashboard))
+// {
+// String dashboardId = getName();
+// dashboardContext = new DashboardContext(dashboardId);
+// }
+// }
+// else if (parent != null)
+// {
+// dashboardContext = parent.getDashboardContext();
+// }
+// }
+//
+// //
+// return dashboardContext;
+// }
- // We need the parent to find out the context details
- if (this instanceof ContextImpl)
- {
- String dashboard = getDeclaredProperty("dashboard");
- if ("true".equals(dashboard))
- {
- String dashboardId = getName();
- dashboardContext = new DashboardContext(dashboardId);
- }
- }
- else if (parent != null)
- {
- dashboardContext = parent.getDashboardContext();
- }
- }
-
- //
- return dashboardContext;
- }
-
protected final void addChild(String name, PortalObjectImpl childObject) throws DuplicatePortalObjectException, IllegalArgumentException
{
objectNode.addChild(name, childObject);
Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/PortalContainer.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/portal/PortalContainer.java 2007-05-21 11:41:17 UTC (rev 7291)
+++ trunk/core/src/main/org/jboss/portal/core/model/portal/PortalContainer.java 2007-05-21 12:17:37 UTC (rev 7292)
@@ -57,24 +57,22 @@
*/
Portal getDefaultPortal();
- /**
- * Returns an existing portal container or null if such a child does not exist or does not have the appropriate type.
- *
- * @param name the portal container name
- * @return the specified portal container
- * @throws IllegalArgumentException if the specified name is null
- */
- PortalContainer getPortalContainer(String name) throws IllegalArgumentException;
-
- /**
- * Creates a new portal container.
- *
- * @param name the portal container name
- * @return the newly created portal container
- * @throws DuplicatePortalObjectException if a child with the specified name already exists
- * @throws IllegalArgumentException if the name argument is null
- */
- PortalContainer createPortalContainer(String name) throws DuplicatePortalObjectException, IllegalArgumentException;
-
-
+// /**
+// * Returns an existing portal container or null if such a child does not exist or does not have the appropriate type.
+// *
+// * @param name the portal container name
+// * @return the specified portal container
+// * @throws IllegalArgumentException if the specified name is null
+// */
+// PortalContainer getPortalContainer(String name) throws IllegalArgumentException;
+//
+// /**
+// * Creates a new portal container.
+// *
+// * @param name the portal container name
+// * @return the newly created portal container
+// * @throws DuplicatePortalObjectException if a child with the specified name already exists
+// * @throws IllegalArgumentException if the name argument is null
+// */
+// PortalContainer createPortalContainer(String name) throws DuplicatePortalObjectException, IllegalArgumentException;
}
Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java 2007-05-21 11:41:17 UTC (rev 7291)
+++ trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java 2007-05-21 12:17:37 UTC (rev 7292)
@@ -187,10 +187,10 @@
*/
Map getDeclaredProperties();
- /**
- * Return true if the portal object is part of a dashboard.
- *
- * @return if it is a dashboard
- */
- boolean isDashboard();
+// /**
+// * Return true if the portal object is part of a dashboard.
+// *
+// * @return if it is a dashboard
+// */
+// boolean isDashboard();
}
17 years
JBoss Portal SVN: r7291 - in trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf: common and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-05-21 07:41:17 -0400 (Mon, 21 May 2007)
New Revision: 7291
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml
Log:
JBPORTAL-1449: In the Portlet Instance Details that show up at the bottom of the portlet when a portlet instance ID is clicked, the field data should be left aligned in a column next to the labels.
JBPORTAL-1450: The "Show the associated portlet" link should be removed
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml 2007-05-21 11:08:30 UTC (rev 7290)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml 2007-05-21 11:41:17 UTC (rev 7291)
@@ -5,14 +5,35 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jstl/core">
- <div><span class="portlet-form-field-label">Portlet name:</span> #{portlet.name.value}</div>
- <div><span class="portlet-form-field-label">Portlet description:</span> #{portlet.description.value}</div>
- <div><span class="portlet-form-field-label">Portlet title:</span> #{portlet.title.value}</div>
- <div><span class="portlet-form-field-label">Portlet keywords:</span> #{portlet.keywords.value}</div>
- <c:if test="#{not empty portlet.locales}">
- <div><span class="portlet-form-field-label">Portlet locales:</span>
- <c:forEach items="#{portlet.locales}" var="locale"> #{locale} </c:forEach>
- </div>
- </c:if>
-
+ <table>
+ <tr>
+ <td class="portlet-form-field-label">Portlet name:</td>
+ <td><h:form><h:commandLink
+ action="#{portletmgr.selectPortlet}">
+ <f:param name="id" value="#{portlet.context.id}"/>
+ <f:param name="plugin" value="manager"/>
+ #{portlet.name.value}
+ </h:commandLink></h:form></td>
+ </tr>
+ <tr>
+ <td class="portlet-form-field-label">Portlet description:</td>
+ <td>#{portlet.description.value}</td>
+ </tr>
+ <tr>
+ <td class="portlet-form-field-label">Portlet title:</td>
+ <td>#{portlet.title.value}</td>
+ </tr>
+ <tr>
+ <td class="portlet-form-field-label">Portlet keywords:</td>
+ <td>#{portlet.keywords.value}</td>
+ </tr>
+ <c:if test="#{not empty portlet.locales}">
+ <tr>
+ <td class="portlet-form-field-label">Portlet locales:</td>
+ <td>
+ <c:forEach items="#{portlet.locales}" var="locale"> #{locale} </c:forEach>
+ </td>
+ </tr>
+ </c:if>
+ </table>
</div>
\ No newline at end of file
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-05-21 11:08:30 UTC (rev 7290)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-05-21 11:41:17 UTC (rev 7291)
@@ -69,16 +69,9 @@
<c:when test="#{instancemgr.selectedInstance.portlet != null}">
<h3>Portlet details
</h3>
- <h:form>
- <h:commandLink
- action="#{portletmgr.selectPortlet}">
- <f:param name="id" value="#{instancemgr.selectedInstance.portlet.context.id}"/>
- <f:param name="plugin" value="manager"/>
- Show
- </h:commandLink> the associated portlet
- </h:form>
<ui:include src="common/showPortletDetails.xhtml">
<ui:param name="portlet" value="#{instancemgr.selectedInstance.portlet}"/>
+ <ui:param name="portletmgr" value="#{portletmgr}"/>
</ui:include>
</c:when>
<c:otherwise>
17 years
JBoss Portal SVN: r7290 - in trunk/core-admin/src: resources/portal-admin-war/WEB-INF/jsf/common and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-05-21 07:08:30 -0400 (Mon, 21 May 2007)
New Revision: 7290
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml
Log:
JBPORTAL-1448: The "Yes" and "No" links should be made into buttons to be consistent with the rest of the screens in the portlet.
Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-05-21 10:18:46 UTC (rev 7289)
+++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-05-21 11:08:30 UTC (rev 7290)
@@ -432,8 +432,7 @@
selectObject((PortalObjectId)null);
// Get id
- Map pmap = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap();
- String id = (String)pmap.get("id");
+ String id = (String)ae.getComponent().getAttributes().get("objectId");
// Destroy the object
if (id != null)
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2007-05-21 10:18:46 UTC (rev 7289)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2007-05-21 11:08:30 UTC (rev 7290)
@@ -33,15 +33,9 @@
<p class="portlet-class">Are you sure ?</p>
<h:form>
- <h:commandLink action="objects" actionListener="#{portalobjectmgr.destroyObject}">
- <h:outputText value="Yes"/>
- <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
- </h:commandLink>
- <h:outputText value=" | "/>
- <h:commandLink action="objects" actionListener="#{portalobjectmgr.selectObject}">
- <h:outputText value="No"/>
- <f:param name="id" value="#{portalobjectmgr.selectedObject.parent.id}"/>
- </h:commandLink>
-
+ <h:commandButton value="Yes" action="objects" actionListener="#{portalobjectmgr.destroyObject}" styleClass="portlet-form-button">
+ <f:attribute name="objectId" value="#{portalobjectmgr.selectedObject.id}" />
+ </h:commandButton>
+ <h:commandButton value="No" action="objects" actionListener="objects" styleClass="portlet-form-button"/>
</h:form>
</div>
\ No newline at end of file
17 years
JBoss Portal SVN: r7289 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-05-21 06:18:46 -0400 (Mon, 21 May 2007)
New Revision: 7289
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml
Log:
JBPORTAL-1447: The WARNING message should be increased in size, and bolded to show its importance.
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2007-05-21 10:13:35 UTC (rev 7288)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2007-05-21 10:18:46 UTC (rev 7289)
@@ -7,7 +7,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="admin-ui">
- <p class="portlet-class">WARNING ! You are about to delete the following element of the portal:</p>
+ <p class="portlet-msg-alert">WARNING ! You are about to delete the following element of the portal:</p>
<ul class="objectpath">
<c:forEach items="#{portalobjectmgr.selectedObjectPath}" var="node">
<li>
17 years