JBoss Portal SVN: r11936 - in branches/JBoss_Portal_Branch_2_7/core-admin/src: resources/portal-admin-war/jsf and 1 other directory.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-09-18 22:44:57 -0400 (Thu, 18 Sep 2008)
New Revision: 11936
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectTemplate.xhtml
Log:
https://jira.jboss.org/jira/browse/JBPORTAL-2105 added default icon to object nav
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css 2008-09-19 01:27:52 UTC (rev 11935)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css 2008-09-19 02:44:57 UTC (rev 11936)
@@ -376,7 +376,7 @@
padding-top: 2px;
padding-bottom: 2px;
line-height: 17px;
- padding-left: 20px;
+ padding-left: 22px;
white-space: nowrap;
}
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml 2008-09-19 01:27:52 UTC (rev 11935)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml 2008-09-19 02:44:57 UTC (rev 11936)
@@ -12,7 +12,7 @@
#{portalobjectmgr.selectedObject.typeName}</h3>
<h:form id="admin-portal-form">
- <h:panelGrid columns="7" cellpadding="0" cellspacing="0" border="0">
+ <h:panelGrid columns="11" cellpadding="0" cellspacing="0" border="0">
<h:commandLink rendered="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_PAGE}"
action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionLayout">
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectTemplate.xhtml 2008-09-19 01:27:52 UTC (rev 11935)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectTemplate.xhtml 2008-09-19 02:44:57 UTC (rev 11936)
@@ -41,11 +41,15 @@
</h:panelGroup>
</c:when>
<c:otherwise>
- <h:commandLink action="#{portalobjectmgr.selectObject}">
+ <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="#{node.typeName == 'portal' ? 'actionSelectPortal' : ''}">
<f:param name="id" value="#{node.id}"/>
<c:choose>
<c:when test="#{node.type == PortalObject.TYPE_CONTEXT}">#{bundle.PORTALS}</c:when>
- <c:otherwise><span class="objectName">#{node.name}</span> #{node.typeName}</c:otherwise>
+ <c:otherwise>
+ <span class="objectName">
+ #{node.name} #{node.typeName}
+ </span>
+ </c:otherwise>
</c:choose>
</h:commandLink>
</c:otherwise>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11935 - in branches/JBoss_Portal_Branch_2_7: core-admin/src/bin/portal-admin-war/img/jbp-icon-set and 3 other directories.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-09-18 21:27:52 -0400 (Thu, 18 Sep 2008)
New Revision: 11935
Added:
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/delete2.gif
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/deregister.gif
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/display_names.gif
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/delete2.gif
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/deregister.gif
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/display_names.gif
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/generic_icon.gif
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/generic_icon.gif
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/style.css
Log:
add a few more icons and spruce up the portal object listings
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css 2008-09-18 22:34:10 UTC (rev 11934)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css 2008-09-19 01:27:52 UTC (rev 11935)
@@ -359,7 +359,7 @@
}
.admin-ui .actionDelete {
- background-image: url( ../img/jbp-icon-set/delete.gif );
+ background-image: url( ../img/jbp-icon-set/delete2.gif );
background-position: left;
background-repeat: no-repeat;
padding-top: 2px;
@@ -425,7 +425,7 @@
}
.admin-ui .actionDisplayNames {
- background-image: url( ../img/jbp-icon-set/generic_icon.gif );
+ background-image: url( ../img/jbp-icon-set/display_names.gif );
background-position: left;
background-repeat: no-repeat;
padding-top: 2px;
@@ -446,6 +446,17 @@
white-space: nowrap;
}
+.admin-ui .actionSelectPortal {
+ background-image: url( ../img/jbp-icon-set/generic_icon.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 16px;
+ padding-left: 25px;
+ white-space: nowrap;
+}
+
.admin-ui .portlet-content-center {
padding: 0;
margin: 0;
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/delete2.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/delete2.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/deregister.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/deregister.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/display_names.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/display_names.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/generic_icon.gif
===================================================================
(Binary files differ)
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-09-18 22:34:10 UTC (rev 11934)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-09-19 01:27:52 UTC (rev 11935)
@@ -18,7 +18,7 @@
<f:facet name="header">
<h:outputText value="#{bundle.WIZARD_PORTAL}"/>
</f:facet>
- <h:commandLink action="#{portalobjectmgr.selectObject}">#{object.name}
+ <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="actionSelectPortal">#{object.name}
<f:param name="id" value="#{object.id}"/>
</h:commandLink>
</h:column>
Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/delete2.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/delete2.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/deregister.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/deregister.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/display_names.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/display_names.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/generic_icon.gif
===================================================================
(Binary files differ)
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/style.css 2008-09-18 22:34:10 UTC (rev 11934)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/style.css 2008-09-19 01:27:52 UTC (rev 11935)
@@ -163,7 +163,7 @@
}
.wsrp-consumers-ui .actionDeregister {
- background-image: url( img/jbp-icon-set/register.gif );
+ background-image: url( img/jbp-icon-set/deregister.gif );
background-position: left;
background-repeat: no-repeat;
line-height: 17px;
@@ -172,7 +172,7 @@
}
.wsrp-consumers-ui .actionDelete {
- background-image: url( img/jbp-icon-set/delete.gif );
+ background-image: url( img/jbp-icon-set/delete2.gif );
background-position: left;
background-repeat: no-repeat;
padding-top: 2px;
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11934 - in branches/JBoss_Portal_2_6_6_JBPORTAL-2109: cms/src/main/org/jboss/portal/cms/impl/jcr/command and 3 other directories.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2008-09-18 18:34:10 -0400 (Thu, 18 Sep 2008)
New Revision: 11934
Modified:
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/CMSException.java
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ItemExistsCommand.java
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminConstants.java
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
Log:
JBPORTAL-2161 - Special character in filename generates NullPointerException
JBPORTAL-2162 - Special character in foldername throws RepositoryException
JBPORTAL-2163 - File- and foldernames with special characters and umlauts are not exported correctly
Modified: branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/CMSException.java
===================================================================
--- branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/CMSException.java 2008-09-18 21:46:11 UTC (rev 11933)
+++ branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/CMSException.java 2008-09-18 22:34:10 UTC (rev 11934)
@@ -49,4 +49,16 @@
{
super(cause);
}
+
+ public boolean hasPathFormatFailure()
+ {
+ boolean pathFormatFailure = false;
+
+ if(this.getMessage().indexOf("is not a legal path element")!=-1)
+ {
+ pathFormatFailure = true;
+ }
+
+ return pathFormatFailure;
+ }
}
Modified: branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ItemExistsCommand.java
===================================================================
--- branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ItemExistsCommand.java 2008-09-18 21:46:11 UTC (rev 11933)
+++ branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ItemExistsCommand.java 2008-09-18 22:34:10 UTC (rev 11934)
@@ -24,6 +24,7 @@
import org.jboss.portal.cms.impl.jcr.JCRCommand;
import org.jboss.portal.cms.util.FileUtil;
+import org.jboss.portal.cms.CMSException;
import javax.jcr.Session;
@@ -58,7 +59,7 @@
catch (Exception e)
{
e.printStackTrace();
+ throw new CMSException(e);
}
- return null;
}
}
Modified: branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java
===================================================================
--- branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java 2008-09-18 21:46:11 UTC (rev 11933)
+++ branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java 2008-09-18 22:34:10 UTC (rev 11934)
@@ -38,6 +38,7 @@
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
+import java.io.IOException;
import java.util.Date;
import java.util.Enumeration;
import java.util.Locale;
@@ -90,84 +91,14 @@
String itemName = zipEntry.getName();
if (!zipEntry.isDirectory())
{
- long fileSize = zipEntry.getSize();
- byte[] zipBytes = new byte[(int)fileSize];
- InputStream zipDataStream = zipFile.getInputStream(zipEntry);
- long bytesRead = 0;
-
- while (bytesRead < fileSize)
- {
- bytesRead += zipDataStream.read(zipBytes, (int)bytesRead, (int)(fileSize - bytesRead));
- }
-
- org.jboss.portal.cms.model.File file = new FileImpl();
-
- String sBasePath = FileUtil.cleanDoubleSlashes("/" + this.msRootPath + "/" + itemName);
- sBasePath = FileUtil.cleanDoubleSlashes(sBasePath); // hackish, but necessary for root path uploads.
- file.setBasePath(sBasePath);
-
- Content content = new ContentImpl();
- content.setEncoding("UTF-8");
- content.setTitle(itemName);
- content.setDescription(itemName);
- content.setBasePath(sBasePath + "/" + this.msLanguage);
- content.setBytes(zipBytes);
- file.setContent(new Locale(this.msLanguage), content);
-
- //Store the file
- JCRCommand nodeExists = (JCRCommand)context.getCommandFactory().createItemExistsCommand(file.getBasePath());
- Boolean bExists = (Boolean)context.execute(nodeExists);
- if (!bExists.booleanValue())
- {
- //Create new file
- JCRCommand newFile = (JCRCommand)context.getCommandFactory().createNewFileCommand(file, content);
- context.execute(newFile);
- }
- else
- {
- //Update the existing one, and make the new version created
- //in return as live
- JCRCommand updateFile = (JCRCommand)context.getCommandFactory().createUpdateFileCommand(file, content, true);
- context.execute(updateFile);
- }
+ this.addFile(zipFile, zipEntry);
}
else // isDirectory
{
- // trim trailing slash.
- if (itemName.endsWith("/"))
- {
- itemName = itemName.substring(0, itemName.length() - 1);
- }
-
- if (!"".equals(itemName))
- {
- String sBasePath = FileUtil.cleanDoubleSlashes("/" + this.msRootPath + "/" + itemName);
- sBasePath = FileUtil.cleanDoubleSlashes(sBasePath); // hackish, but necessary for root path uploads.
- String sParentPath = NodeUtil.getParentPath(sBasePath);
- JCRCommand nodeExists = (JCRCommand)context.getCommandFactory().createItemExistsCommand(sParentPath);
- Boolean bExists = (Boolean)context.execute(nodeExists);
- if (!bExists.booleanValue())
- {
- this.createParentHierarchy(sParentPath);
- }
-
- JCRCommand nodeExists2 = (JCRCommand)context.getCommandFactory().createItemExistsCommand(sBasePath);
- Boolean bExists2 = (Boolean)context.execute(nodeExists2);
- if (!bExists2.booleanValue())
- {
- Folder folder = new FolderImpl();
- folder.setName(itemName);
- folder.setDescription(itemName);
- folder.setTitle(itemName);
- folder.setLastModified(new Date());
- folder.setBasePath(sBasePath);
-
- JCRCommand folderSave = (JCRCommand)context.getCommandFactory().createFolderSaveCommand(folder);
- context.execute(folderSave);
- }
- }
+ this.addFolder(zipEntry);
}
}
+
return null;
}
catch (Exception e)
@@ -182,6 +113,112 @@
}
}
}
+
+ /**
+ *
+ * @param zipFile
+ * @param zipEntry
+ * @throws IOException
+ */
+ private void addFile(ZipFile zipFile, ZipEntry zipEntry) throws IOException
+ {
+ try
+ {
+ String itemName = zipEntry.getName();
+ long fileSize = zipEntry.getSize();
+ byte[] zipBytes = new byte[(int)fileSize];
+ InputStream zipDataStream = zipFile.getInputStream(zipEntry);
+ long bytesRead = 0;
+
+ while (bytesRead < fileSize)
+ {
+ bytesRead += zipDataStream.read(zipBytes, (int)bytesRead, (int)(fileSize - bytesRead));
+ }
+
+ org.jboss.portal.cms.model.File file = new FileImpl();
+
+ String sBasePath = FileUtil.cleanDoubleSlashes("/" + this.msRootPath + "/" + itemName);
+ sBasePath = FileUtil.cleanDoubleSlashes(sBasePath); // hackish, but necessary for root path uploads.
+ file.setBasePath(sBasePath);
+
+ Content content = new ContentImpl();
+ content.setEncoding("UTF-8");
+ content.setTitle(itemName);
+ content.setDescription(itemName);
+ content.setBasePath(sBasePath + "/" + this.msLanguage);
+ content.setBytes(zipBytes);
+ file.setContent(new Locale(this.msLanguage), content);
+
+ //Store the file
+ JCRCommand nodeExists = (JCRCommand)context.getCommandFactory().createItemExistsCommand(file.getBasePath());
+ Boolean bExists = (Boolean)context.execute(nodeExists);
+ if (!bExists.booleanValue())
+ {
+ //Create new file
+ JCRCommand newFile = (JCRCommand)context.getCommandFactory().createNewFileCommand(file, content);
+ context.execute(newFile);
+ }
+ else
+ {
+ //Update the existing one, and make the new version created
+ //in return as live
+ JCRCommand updateFile = (JCRCommand)context.getCommandFactory().createUpdateFileCommand(file, content, true);
+ context.execute(updateFile);
+ }
+ }
+ catch(CMSException e)
+ {
+ //Log the error, but don't fail creation of other resources in the archive
+ log.error(this, e);
+ }
+ }
+
+ private void addFolder(ZipEntry zipEntry)
+ {
+ try
+ {
+ String itemName = zipEntry.getName();
+
+ //trim trailing slash.
+ if (itemName.endsWith("/"))
+ {
+ itemName = itemName.substring(0, itemName.length() - 1);
+ }
+
+ if (!"".equals(itemName))
+ {
+ String sBasePath = FileUtil.cleanDoubleSlashes("/" + this.msRootPath + "/" + itemName);
+ sBasePath = FileUtil.cleanDoubleSlashes(sBasePath); // hackish, but necessary for root path uploads.
+ String sParentPath = NodeUtil.getParentPath(sBasePath);
+ JCRCommand nodeExists = (JCRCommand)context.getCommandFactory().createItemExistsCommand(sParentPath);
+ Boolean bExists = (Boolean)context.execute(nodeExists);
+ if (!bExists.booleanValue())
+ {
+ this.createParentHierarchy(sParentPath);
+ }
+
+ JCRCommand nodeExists2 = (JCRCommand)context.getCommandFactory().createItemExistsCommand(sBasePath);
+ Boolean bExists2 = (Boolean)context.execute(nodeExists2);
+ if (!bExists2.booleanValue())
+ {
+ Folder folder = new FolderImpl();
+ folder.setName(itemName);
+ folder.setDescription(itemName);
+ folder.setTitle(itemName);
+ folder.setLastModified(new Date());
+ folder.setBasePath(sBasePath);
+
+ JCRCommand folderSave = (JCRCommand)context.getCommandFactory().createFolderSaveCommand(folder);
+ context.execute(folderSave);
+ }
+ }
+ }
+ catch(Exception e)
+ {
+ //Log the error, but don't fail creation of other resources in the archive
+ log.error(this, e);
+ }
+ }
/** @param parentPath */
private void createParentHierarchy(String parentPath) throws CMSException
Modified: branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminConstants.java
===================================================================
--- branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminConstants.java 2008-09-18 21:46:11 UTC (rev 11933)
+++ branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminConstants.java 2008-09-18 22:34:10 UTC (rev 11934)
@@ -63,6 +63,8 @@
public static final String OP_CREATE_COLLECTION = "createcollection";
public static final String OP_CONFIRM_CREATE_COLLECTION = "confirmcreatecollection";
+
+ public static final String OP_CONFIRM_CREATE_COLLECTION_VALIDATION_ERROR = "confirmcreatecollection_validationError";
public static final String OP_CONFIRMCOPY = "confirmcopy";
@@ -111,4 +113,8 @@
public static final String OP_VIEWPENDINGPREVIEW = "view_pending_preview";
public static final String OP_MODIFYANDAPPROVE = "modify_and_approve";
+
+ public static final String CMS_FILENAME_INVALID = "CMS_FILENAME_INVALID";
+
+ public static final String CMS_FOLDERNAME_INVALID = "CMS_FOLDERNAME_INVALID";
}
Modified: branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java
===================================================================
--- branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-09-18 21:46:11 UTC (rev 11933)
+++ branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-09-18 22:34:10 UTC (rev 11934)
@@ -78,7 +78,6 @@
import javax.portlet.UnavailableException;
import java.io.IOException;
import java.io.InputStream;
-import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
@@ -274,7 +273,7 @@
javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/main.jsp");
prd.include(rReq, rRes);
}
- else if (CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION.equals(op))
+ else if (CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION.equals(op) || CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION_VALIDATION_ERROR.equals(op))
{
try
{
@@ -295,6 +294,21 @@
String sPath = rReq.getParameter("path");
rRes.setContentType("text/html");
rReq.setAttribute("createpath", sPath);
+
+ if (rReq.getParameter("error:message") != null)
+ {
+ rReq.setAttribute("error:message", rReq.getParameter("error:message"));
+ }
+ if (rReq.getParameter("error:newcollectionname") != null)
+ {
+ rReq.setAttribute("error:newcollectionname", rReq.getParameter("error:newcollectionname"));
+ }
+ if (rReq.getParameter("error:newcollectiondescription") != null)
+ {
+ rReq.setAttribute("error:newcollectiondescription", rReq.getParameter("error:newcollectiondescription"));
+ }
+
+
javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/confirmcreatecollection.jsp");
prd.include(rReq, rRes);
}
@@ -563,6 +577,14 @@
{
rReq.setAttribute("error:language", rReq.getParameter("error:language"));
}
+ if (rReq.getParameter("error:filename") != null)
+ {
+ rReq.setAttribute("error:filename", rReq.getParameter("error:filename"));
+ }
+ if (rReq.getParameter("error:message") != null)
+ {
+ rReq.setAttribute("error:message", rReq.getParameter("error:message"));
+ }
javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/create.jsp");
prd.include(rReq, rRes);
@@ -875,11 +897,46 @@
folder.setName(sFolderName);
folder.setBasePath(sNewPath);
- Command saveCMD = CMSService.getCommandFactory().createFolderSaveCommand(folder);
- CMSService.execute(saveCMD);
+ try
+ {
+ Command saveCMD = CMSService.getCommandFactory().createFolderSaveCommand(folder);
+ CMSService.execute(saveCMD);
+ }
+ catch(CMSException cme)
+ {
+ if(cme.hasPathFormatFailure())
+ {
+ //Validation Error occurred
+ //FileName should not be empty
+ aRes.setRenderParameter("op", CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION_VALIDATION_ERROR);
+ aRes.setRenderParameter("path", aReq.getParameter("destination"));
+ //used to remember the data already submitted by the user
+ aRes.setRenderParameter("error:message", CMSAdminConstants.CMS_FOLDERNAME_INVALID);
+ aRes.setRenderParameter("error:newcollectionname", aReq.getParameter("newcollectionname"));
+ aRes.setRenderParameter("error:newcollectiondescription", aReq.getParameter("newcollectiondescription"));
+
+ return;
+ }
+ else
+ {
+ throw cme;
+ }
+ }
+
aRes.setRenderParameter("op", CMSAdminConstants.OP_MAIN);
aRes.setRenderParameter("path", sNewPath);
+ }
+ else
+ {
+ //Validation Error
+ aRes.setRenderParameter("op", CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION_VALIDATION_ERROR);
+ aRes.setRenderParameter("path", aReq.getParameter("destination"));
+
+ //used to remember the data already submitted by the user
+ aRes.setRenderParameter("error:message", CMSAdminConstants.CMS_FOLDERNAME_INVALID);
+ aRes.setRenderParameter("error:newcollectionname", aReq.getParameter("newcollectionname"));
+ aRes.setRenderParameter("error:newcollectiondescription", aReq.getParameter("newcollectiondescription"));
}
}
else if (CMSAdminConstants.OP_UPLOADCONTENT.equals(op))
@@ -1262,8 +1319,40 @@
file.setContent(new Locale(sLanguage), content);
+ //Check and make sure file can be successfully saved
Command existsCMD = CMSService.getCommandFactory().createItemExistsCommand(content.getBasePath());
- Boolean bExists = (Boolean)CMSService.execute(existsCMD);
+ Boolean bExists = null;
+ try
+ {
+ bExists = (Boolean)CMSService.execute(existsCMD);
+ }
+ catch(CMSException cme)
+ {
+ if(cme.hasPathFormatFailure())
+ {
+ //Validation Error occurred
+ //FileName should not be empty
+ aRes.setRenderParameter("op", CMSAdminConstants.OP_CREATEFILE_VALIDATION_ERROR);
+
+ //set render parameters here
+ aRes.setRenderParameter("path", sDirectory);
+
+ //used to remember the data already submitted by the user
+ aRes.setRenderParameter("error:message", CMSAdminConstants.CMS_FILENAME_INVALID);
+ aRes.setRenderParameter("error:filename", aReq.getParameter("filename"));
+ aRes.setRenderParameter("error:content", aReq.getParameter("elm1"));
+ aRes.setRenderParameter("error:description", aReq.getParameter("description"));
+ aRes.setRenderParameter("error:title", aReq.getParameter("title"));
+ aRes.setRenderParameter("error:language", aReq.getParameter("language"));
+
+ return;
+ }
+ else
+ {
+ throw cme;
+ }
+ }
+
if (bExists.booleanValue()) // if file exists, update contentNode
{
Command cmdUpdate = CMSService.getCommandFactory().createUpdateFileCommand(file, content, true);
Modified: branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-09-18 21:46:11 UTC (rev 11933)
+++ branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-09-18 22:34:10 UTC (rev 11934)
@@ -135,3 +135,6 @@
CMS_ACCESS_DENIED=Access Denied
CMS_ACCESS_DENIED_DESCRIPTION=You are not allowed to access this resource
CMS_ACCESS_DENIED_DESCRIPTION_PATH=You are not allowed to access the resource
+
+CMS_FILENAME_INVALID=File Name is invalid. It may contain illegal characters
+CMS_FOLDERNAME_INVALID=Folder Name is invalid. It may contain illegal characters
Modified: branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp
===================================================================
--- branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2008-09-18 21:46:11 UTC (rev 11933)
+++ branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2008-09-18 22:34:10 UTC (rev 11934)
@@ -6,6 +6,19 @@
<%
String sCurrPath = (String)request.getAttribute("createpath");
String OP = CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION;
+
+ //validation handling related data
+ String newcollectionname = (String)request.getAttribute("error:newcollectionname");
+ String newcollectiondescription = (String)request.getAttribute("error:newcollectiondescription");
+ String errorMessage = (String)request.getAttribute("error:message");
+ if(newcollectionname == null)
+ {
+ newcollectionname = "";
+ }
+ if(newcollectiondescription == null)
+ {
+ newcollectiondescription = "";
+ }
%>
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/>
@@ -14,6 +27,14 @@
<h3 class="sectionTitle-blue">${n:i18n("TITLE_CREATECOLLCONFIRM")}</h3>
<div class=" cms-tab-container">
<table width="100%">
+ <%if(errorMessage != null){%>
+ <tr>
+ <td colspan="2">
+ <font color="red">${n:i18n("CMS_FOLDERNAME_INVALID")}</font>
+ </td>
+ </tr>
+ <%}%>
+
<tr>
<td valign="top" width="250" class="portlet-section-alternate">
<%@ include file="folderlist.jsp" %>
@@ -36,14 +57,14 @@
<tr>
<td valign="bottom">${n:i18n("CMS_NAME")}:</td>
<td align="left"><input class="portlet-form-input-field" type="text"
- name="newcollectionname" size="40" maxlength="50">
+ name="newcollectionname" size="40" maxlength="50" value="<%=newcollectionname%>">
</td>
</tr>
<tr>
<td valign="bottom">${n:i18n("CMS_DESCRIPTION")}:</td>
<td align="left"><input class="portlet-form-input-field" type="text"
name="newcollectiondescription"
- size="40" maxlength="80">
+ size="40" maxlength="80" <%=newcollectiondescription%> value="<%=newcollectiondescription%>">
</td>
</tr>
<tr>
Modified: branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
===================================================================
--- branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2008-09-18 21:46:11 UTC (rev 11933)
+++ branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2008-09-18 22:34:10 UTC (rev 11934)
@@ -19,6 +19,8 @@
String description = (String)request.getAttribute("error:description");
String title = (String)request.getAttribute("error:title");
String language = (String)request.getAttribute("error:language");
+ String fileName = (String)request.getAttribute("error:filename");
+ String errorMessage = (String)request.getAttribute("error:message");
if (sContent == null)
{
sContent = "";
@@ -35,6 +37,10 @@
{
language = "";
}
+ if(fileName == null)
+ {
+ fileName = "";
+ }
%>
<!-- tinyMCE -->
@@ -104,7 +110,16 @@
<tr>
<td height="10"></td>
</tr>
+
+<%if(errorMessage != null){%>
<tr>
+ <td colspan="2">
+ <font color="red">${n:i18n("CMS_FILENAME_INVALID")}</font>
+ </td>
+</tr>
+<%}%>
+
+<tr>
<td>
<table>
<tr>
@@ -118,7 +133,9 @@
<td>
<input
type="text" name="filename"
- class="portlet-form-input-field"/>
+ class="portlet-form-input-field"
+ value="<%=fileName%>"
+ />
: ${n:i18n("CMS_REQUIRED")}
</td>
</tr>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11933 - in branches/JBoss_Portal_Branch_2_7: core-admin/src/bin/portal-admin-war/img and 5 other directories.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-09-18 17:46:11 -0400 (Thu, 18 Sep 2008)
New Revision: 11933
Added:
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/accept.gif
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/activate.gif
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/add.gif
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/coordination.gif
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/deactivate.gif
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/default.gif
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/delete.gif
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/generic_icon.gif
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/layout.gif
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/make_default.gif
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/refresh.gif
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/register.gif
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/rename.gif
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/security.gif
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/settings.gif
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/theme.gif
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/window.gif
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/window_add.gif
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/window_copy.gif
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/window_edit.gif
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/window_error.gif
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/window_remove.gif
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/accept.gif
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/activate.gif
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/add.gif
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/coordination.gif
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/deactivate.gif
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/default.gif
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/delete.gif
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/generic_icon.gif
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/layout.gif
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/make_default.gif
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/refresh.gif
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/register.gif
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/rename.gif
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/security.gif
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/settings.gif
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/theme.gif
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/window.gif
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/window_add.gif
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/window_copy.gif
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/window_edit.gif
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/window_error.gif
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/window_remove.gif
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/style.css
Log:
implement new icon set for admin portlet and wsrp
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css 2008-09-18 18:33:11 UTC (rev 11932)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css 2008-09-18 21:46:11 UTC (rev 11933)
@@ -299,120 +299,153 @@
}
.admin-ui .actionDetails {
- background-image: url( ../img/actionIcon_Details.gif );
+ background-image: url( ../img/jbp-icon-set/settings.gif );
background-position: left;
background-repeat: no-repeat;
- line-height: 14px;
+ line-height: 15px;
padding-left: 18px;
white-space: nowrap;
}
.admin-ui .actionLayout {
- background-image: url( ../img/actionIcon_Layout.gif );
+ background-image: url( ../img/jbp-icon-set/layout.gif );
background-position: left;
background-repeat: no-repeat;
- line-height: 14px;
- padding-left: 18px;
+ line-height: 15px;
+ padding-left: 20px;
white-space: nowrap;
}
.admin-ui .actionSecurity {
- background-image: url( ../img/actionIcon_Security.gif );
+ background-image: url( ../img/jbp-icon-set/security.gif );
background-position: left;
background-repeat: no-repeat;
line-height: 14px;
- padding-left: 18px;
+ padding-left: 20px;
white-space: nowrap;
}
.admin-ui .actionProperties {
- background-image: url( ../img/actionIcon_Properties.gif );
+ background-image: url( ../img/jbp-icon-set/settings.gif );
background-position: left;
background-repeat: no-repeat;
padding-top: 2px;
padding-bottom: 2px;
- padding-left: 18px;
+ padding-left: 20px;
white-space: nowrap;
height: 22px;
}
.admin-ui .actionTheme {
- background-image: url( ../img/actionIcon_Theme.gif );
+ background-image: url( ../img/jbp-icon-set/theme.gif );
background-position: left;
background-repeat: no-repeat;
padding-top: 2px;
padding-bottom: 2px;
line-height: 18px;
- padding-left: 18px;
+ padding-left: 20px;
white-space: nowrap;
}
.admin-ui .actionRename {
- background-image: url( ../img/actionIcon_Rename.gif );
+ background-image: url( ../img/jbp-icon-set/rename.gif );
background-position: left;
background-repeat: no-repeat;
padding-top: 2px;
padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
+ line-height: 15px;
+ padding-left: 20px;
white-space: nowrap;
}
.admin-ui .actionDelete {
- background-image: url( ../img/actionIcon_Delete.gif );
+ background-image: url( ../img/jbp-icon-set/delete.gif );
background-position: left;
background-repeat: no-repeat;
padding-top: 2px;
padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
+ line-height: 15px;
+ padding-left: 20px;
white-space: nowrap;
}
.admin-ui .actionMakeDefault {
- background-image: url( ../img/actionIcon_MakeDefault.gif );
+ background-image: url( ../img/jbp-icon-set/make_default.gif );
background-position: left;
background-repeat: no-repeat;
padding-top: 2px;
padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
+ line-height: 17px;
+ padding-left: 20px;
white-space: nowrap;
}
.admin-ui .actionDefault {
- background-image: url( ../img/actionIcon_IsDefault.gif );
+ background-image: url( ../img/jbp-icon-set/default.gif );
background-position: left;
background-repeat: no-repeat;
padding-top: 2px;
padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
+ line-height: 17px;
+ padding-left: 22px;
white-space: nowrap;
}
.admin-ui .actionPreferences {
- background-image: url( ../img/actionIcon_Properties.gif );
+ background-image: url( ../img/jbp-icon-set/settings.gif );
background-position: left;
background-repeat: no-repeat;
padding-top: 2px;
padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
+ line-height: 15px;
+ padding-left: 20px;
white-space: nowrap;
}
.admin-ui .actionCreateInstance {
- background-image: url( ../img/actionIcon_CreateInstance.gif );
+ background-image: url( ../img/jbp-icon-set/window_add.gif );
background-position: left;
background-repeat: no-repeat;
padding-top: 2px;
padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
+ line-height: 16px;
+ padding-left: 21px;
white-space: nowrap;
}
+.admin-ui .actionDeleteInstance {
+ background-image: url( ../img/jbp-icon-set/window_remove.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 16px;
+ padding-left: 21px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionDisplayNames {
+ background-image: url( ../img/jbp-icon-set/generic_icon.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 16px;
+ padding-left: 23px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionCoordination {
+ background-image: url( ../img/jbp-icon-set/coordination.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 15px;
+ padding-left: 20px;
+ white-space: nowrap;
+}
+
.admin-ui .portlet-content-center {
padding: 0;
margin: 0;
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/accept.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/accept.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/activate.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/activate.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/add.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/add.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/coordination.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/coordination.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/deactivate.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/deactivate.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/default.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/default.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/delete.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/delete.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/generic_icon.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/generic_icon.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/layout.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/layout.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/make_default.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/make_default.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/refresh.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/refresh.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/register.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/register.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/rename.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/rename.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/security.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/security.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/settings.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/settings.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/theme.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/theme.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/window.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/window.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/window_add.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/window_add.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/window_copy.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/window_copy.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/window_edit.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/window_edit.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/window_error.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/window_error.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/window_remove.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/window_remove.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-09-18 21:46:11 UTC (rev 11933)
@@ -62,16 +62,18 @@
</h:column>
<h:column>
<f:facet name="header">#{bundle.COORDINATION_ALIAS_EXISTING_ACTIONS}</f:facet>
+ <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0">
<h:commandLink action="renameCoordination" actionListener="#{coordinationManager.select}">
<h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/>
<f:param name="name" value="#{binding.name}"/>
<f:param name="type" value="alias"/>
- </h:commandLink> |
+ </h:commandLink>
<h:commandLink action="confirmCoordinationDeletion" actionListener="#{coordinationManager.select}">
<h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/>
<f:param name="name" value="#{binding.name}"/>
<f:param name="type" value="alias"/>
</h:commandLink>
+ </h:panelGrid>
</h:column>
</h:dataTable>
</div>
@@ -147,16 +149,18 @@
</h:column>
<h:column>
<f:facet name="header">#{bundle.COORDINATION_PARAMETER_EXISTING_ACTIONS}</f:facet>
+ <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0">
<h:commandLink action="renameCoordination" actionListener="#{coordinationManager.select}">
<h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/>
<f:param name="name" value="#{binding.name}"/>
<f:param name="type" value="parameter"/>
- </h:commandLink> |
+ </h:commandLink>
<h:commandLink action="confirmCoordinationDeletion" actionListener="#{coordinationManager.select}">
<h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/>
<f:param name="name" value="#{binding.name}"/>
<f:param name="type" value="parameter"/>
</h:commandLink>
+ </h:panelGrid>
</h:column>
</h:dataTable>
</h:form>
@@ -296,16 +300,18 @@
<f:facet name="header">
#{bundle.COORDINATION_EVENT_EXISTING_ACTIONS}"
</f:facet>
+ <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0">
<h:commandLink action="renameCoordination" actionListener="#{coordinationManager.select}">
<h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/>
<f:param name="name" value="#{wiring.name}"/>
<f:param name="type" value="wiring"/>
- </h:commandLink> |
+ </h:commandLink>
<h:commandLink action="confirmCoordinationDeletion" actionListener="#{coordinationManager.select}">
<h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/>
<f:param name="name" value="#{wiring.name}"/>
<f:param name="type" value="wiring"/>
</h:commandLink>
+ </h:panelGrid>
</h:column>
</h:dataTable>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml 2008-09-18 21:46:11 UTC (rev 11933)
@@ -12,50 +12,51 @@
#{portalobjectmgr.selectedObject.typeName}</h3>
<h:form id="admin-portal-form">
- <h:panelGroup rendered="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_PAGE}"><h:commandLink
+ <h:panelGrid columns="7" cellpadding="0" cellspacing="0" border="0">
+ <h:commandLink rendered="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_PAGE}"
action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionLayout">
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
#{bundle.PAGE_LAYOUT}
- </h:commandLink> | </h:panelGroup><h:commandLink action="editPageSecurity" styleClass="actionSecurity"
+ </h:commandLink>
+ <h:commandLink action="editPageSecurity" styleClass="actionSecurity"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
#{bundle.SECURITY}
- </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties"
+ </h:commandLink>
+ <h:commandLink action="editProperties" styleClass="actionProperties"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
#{bundle.COMMON_PROPERTIES}
- </h:commandLink> | <h:commandLink action="editPageTheme" styleClass="actionTheme"
+ </h:commandLink>
+ <h:commandLink action="editPageTheme" styleClass="actionTheme"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
#{bundle.THEME}
- </h:commandLink><h:panelGroup
- rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template')))}">
- | <h:commandLink
+ </h:commandLink>
+ <h:commandLink rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template')))}"
action="renameObject" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename">
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
#{bundle.RENAME}
- </h:commandLink></h:panelGroup>
- | <h:commandLink
+ </h:commandLink>
+ <h:commandLink
action="#{addDisplayNameAction.editDisplayNames}" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionDisplayNames">
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}" />
#{bundle.DISPLAY_NAMES}
</h:commandLink>
- <h:panelGroup rendered="#{'page' eq portalobjectmgr.selectedObjectType}">
- | <h:commandLink action="#{coordinationManager.editCoordination}"
+ <h:commandLink action="#{coordinationManager.editCoordination}"
+ rendered="#{'page' eq portalobjectmgr.selectedObjectType}"
actionListener="#{portalobjectmgr.selectObject}"
styleClass="actionCoordination">
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}" />
#{bundle.COORDINATION_COORDINATION}
</h:commandLink>
- </h:panelGroup>
- <h:panelGroup
- rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.default)))}">
- | <h:commandLink action="confirm" styleClass="actionDelete"
+ <h:commandLink action="confirm" styleClass="actionDelete"
+ rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.default)))}"
actionListener="#{portalobjectmgr.selectDeletingObject}">
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
#{bundle.COMMON_DELETE}
</h:commandLink>
- </h:panelGroup>
+ </h:panelGrid>
</h:form>
<h3 class="sectionTitle">#{bundle.MANAGE_SUB_PAGES_WITHIN} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml 2008-09-18 21:46:11 UTC (rev 11933)
@@ -48,23 +48,26 @@
<td>
<h:outputText value="#{instance.displayName}"/>
</td>
- <td><h:commandLink id="security-#{instance.id}" action="#{instancemgr.selectInstance}" styleClass="actionSecurity">
+ <td>
+ <h:panelGrid columns="7" cellpadding="0" cellspacing="0" border="0">
+ <h:commandLink action="#{instancemgr.selectInstance}" styleClass="actionSecurity" id="security-#{instance.id}">
<f:param name="id" value="#{instance.id}"/>
<f:param name="plugin" value="security"/>
#{bundle.SECURITY}
- </h:commandLink> | <h:panelGroup
- rendered="#{! empty(instancemgr.selectedInstancesPrefs[instance.id])}">
- <h:commandLink id="preference-#{instance.id}"
- action="#{instancemgr.selectInstance}" styleClass="actionPreferences">
+ </h:commandLink>
+ <h:commandLink rendered="#{! empty(instancemgr.selectedInstancesPrefs[instance.id])}"
+ id="preference-#{instance.id}" action="#{instancemgr.selectInstance}" styleClass="actionPreferences">
<f:param name="id" value="#{instance.id}"/>
<f:param name="plugin" value="preferences"/>
#{bundle.PREFERENCES}
- </h:commandLink> | </h:panelGroup><h:commandLink id="delete-#{instance.id}" action="confirmDeleteInstance"
- styleClass="actionDelete"
- actionListener="#{instancemgr.selectInstance}">
+ </h:commandLink>
+ <h:commandLink action="confirmDeleteInstance" id="delete-#{instance.id}"
+ styleClass="actionDeleteInstance"
+ actionListener="#{instancemgr.selectInstance}">
<f:param name="id" value="#{instance.id}"/>
#{bundle.COMMON_DELETE}
</h:commandLink>
+ </h:panelGrid>
</td>
</tr>
</c:forEach>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-09-18 21:46:11 UTC (rev 11933)
@@ -26,43 +26,42 @@
<f:facet name="header">
<h:outputText value="#{bundle.ACTIONS}"/>
</f:facet>
+ <h:panelGrid columns="7" cellpadding="0" cellspacing="0" border="0">
<h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}"
styleClass="actionSecurity">
- <f:param name="id" value="#{object.id}"/>
- #{bundle.SECURITY}
- </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties"
+ <f:param name="id" value="#{object.id}"/>#{bundle.SECURITY}
+ </h:commandLink>
+ <h:commandLink action="editProperties" styleClass="actionProperties"
actionListener="#{portalobjectmgr.selectObject}">
- <f:param name="id" value="#{object.id}"/>
- #{bundle.COMMON_PROPERTIES}
- </h:commandLink> | <h:commandLink action="editPortalTheme" styleClass="actionTheme"
+ <f:param name="id" value="#{object.id}"/>#{bundle.COMMON_PROPERTIES}
+ </h:commandLink>
+ <h:commandLink action="editPortalTheme" styleClass="actionTheme"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>
#{bundle.THEME}
</h:commandLink>
- <h:panelGroup
- rendered="#{(object.name != 'admin') and (object.name != 'template')}">
- | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}"
+ <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}"
+ rendered="#{(object.name != 'admin') and (object.name != 'template')}"
styleClass="actionRename">
<h:outputText value="#{bundle.RENAME}"/>
<f:param name="id" value="#{object.id}"/>
</h:commandLink>
- </h:panelGroup>
- <h:panelGroup
- rendered="#{(object.name != 'admin') and (object.name != 'template') and (not object.default)}">
- | <h:commandLink action="confirm" styleClass="actionDelete"
+
+
+ <h:commandLink action="confirm" styleClass="actionDelete" rendered="#{(object.name != 'admin') and (object.name != 'template') and (not object.default)}"
actionListener="#{portalobjectmgr.selectDeletingObject}">
<f:param name="id" value="#{object.id}"/>
#{bundle.COMMON_DELETE}
</h:commandLink>
- </h:panelGroup>
- <h:panelGroup rendered="#{not object.default}"> | <h:commandLink styleClass="actionMakeDefault"
+
+ <h:commandLink styleClass="actionMakeDefault" rendered="#{not object.default}"
action="#{portalobjectmgr.makeObjectDefault}">
<f:param name="id" value="#{object.id}"/>
#{bundle.MAKE_DEFAULT}
</h:commandLink>
- </h:panelGroup>
- <h:panelGroup rendered="#{object.default}"> | <h:outputText styleClass="actionDefault"
- value="#{bundle.DEFAULT}"/></h:panelGroup>
+
+ <h:outputText styleClass="actionDefault" rendered="#{object.default}" value="#{bundle.DEFAULT}"/>
+ </h:panelGrid>
</h:column>
</h:dataTable>
</c:if>
@@ -84,50 +83,50 @@
<f:facet name="header">
<h:outputText value="#{bundle.ACTIONS}"/>
</f:facet>
+ <h:panelGrid columns="7" cellpadding="0" cellspacing="0" border="0">
<h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}"
styleClass="actionLayout">
<f:param name="id" value="#{object.id}"/>
#{bundle.PAGE_LAYOUT}
- </h:commandLink> | <h:commandLink action="editPageSecurity" styleClass="actionSecurity"
+ </h:commandLink> <h:commandLink action="editPageSecurity" styleClass="actionSecurity"
actionListener="#{portalobjectmgr.selectObject}">
- <f:param name="id" value="#{object.id}"/>
- #{bundle.SECURITY}
- </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties"
+ <f:param name="id" value="#{object.id}"/>#{bundle.SECURITY}
+ </h:commandLink> <h:commandLink action="editProperties" styleClass="actionProperties"
actionListener="#{portalobjectmgr.selectObject}">
- <f:param name="id" value="#{object.id}"/>
- #{bundle.COMMON_PROPERTIES}
- </h:commandLink> | <h:commandLink action="editPageTheme" styleClass="actionTheme"
+ <f:param name="id" value="#{object.id}"/>#{bundle.COMMON_PROPERTIES}
+ </h:commandLink> <h:commandLink action="editPageTheme" styleClass="actionTheme"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>
#{bundle.THEME}
- </h:commandLink> | <h:commandLink action="renameObject" styleClass="actionRename"
+ </h:commandLink> <h:commandLink action="renameObject" styleClass="actionRename"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>
#{bundle.RENAME}
- </h:commandLink> | <h:commandLink action="#{addDisplayNameAction.editDisplayNames}" styleClass="actionDisplayNames"
+ </h:commandLink> <h:commandLink action="#{addDisplayNameAction.editDisplayNames}" styleClass="actionDisplayNames"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>
#{bundle.DISPLAY_NAMES}
- </h:commandLink> | <h:commandLink action="#{coordinationManager.editCoordination}" styleClass="actionCoordination"
+ </h:commandLink> <h:commandLink action="#{coordinationManager.editCoordination}" styleClass="actionCoordination"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>
#{bundle.COORDINATION_COORDINATION}
</h:commandLink>
<h:panelGroup
- rendered="#{not object.default}"> | <h:commandLink action="confirm" styleClass="actionDelete"
+ rendered="#{not object.default}"> <h:commandLink action="confirm" styleClass="actionDelete"
actionListener="#{portalobjectmgr.selectDeletingObject}">
<f:param name="id" value="#{object.id}"/>
#{bundle.COMMON_DELETE}
</h:commandLink>
</h:panelGroup>
- <h:panelGroup rendered="#{not object.default}"> | <h:commandLink styleClass="actionMakeDefault"
+ <h:panelGroup rendered="#{not object.default}"> <h:commandLink styleClass="actionMakeDefault"
action="#{portalobjectmgr.makeObjectDefault}">
<f:param name="id" value="#{object.id}"/>
#{bundle.MAKE_DEFAULT}
</h:commandLink>
</h:panelGroup>
- <h:panelGroup rendered="#{object.default}"> | <h:outputText styleClass="actionDefault"
+ <h:panelGroup rendered="#{object.default}"> <h:outputText styleClass="actionDefault"
value="#{bundle.DEFAULT}"/></h:panelGroup>
+ </h:panelGrid>
</h:column>
</h:dataTable>
</c:if>
@@ -178,24 +177,25 @@
<f:facet name="header">
<h:outputText value="#{bundle.ACTIONS}"/>
</f:facet>
+ <h:panelGrid columns="7" cellpadding="0" cellspacing="0" border="0">
<h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}"
styleClass="actionTheme">
<f:param name="id" value="#{object.id}"/>
#{bundle.THEME}
- </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties"
+ </h:commandLink> <h:commandLink action="editProperties" styleClass="actionProperties"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>
- <f:param name="maximizedStateExists" value="#{portalobjectmgr.selectedObject.maximizedStateExists}"/>
- #{bundle.COMMON_PROPERTIES}
- </h:commandLink> | <h:commandLink action="renameObject" styleClass="actionRename"
+ <f:param name="maximizedStateExists" value="#{portalobjectmgr.selectedObject.maximizedStateExists}"/>#{bundle.COMMON_PROPERTIES}
+ </h:commandLink> <h:commandLink action="renameObject" styleClass="actionRename"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>
#{bundle.RENAME}
- </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectDeletingObject}"
+ </h:commandLink> <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectDeletingObject}"
styleClass="actionDelete">
<f:param name="id" value="#{object.id}"/>
#{bundle.COMMON_DELETE}
</h:commandLink>
+ </h:panelGrid>
</h:column>
</h:dataTable>
</c:if>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml 2008-09-18 21:46:11 UTC (rev 11933)
@@ -69,17 +69,18 @@
<td><h:selectBooleanCheckbox disabled="true" value="#{portlet.remote}"/></td>
<td><h:selectBooleanCheckbox disabled="true" value="#{portlet.remotable}"/></td>
<td>
- <h:panelGroup rendered="#{!empty portlet.info.preferences.keys}">
- <h:commandLink id="portlet-pref-#{status.index}" action="#{portletmgr.selectPortlet}" styleClass="actionPreferences">
+ <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0">
+ <h:commandLink id="portlet-pref-#{status.index}" rendered="#{!empty portlet.info.preferences.keys}" action="#{portletmgr.selectPortlet}" styleClass="actionPreferences">
<f:param name="id" value="#{portlet.context.id}"/>
<f:param name="plugin" value="preferences"/>
#{bundle.PREFERENCES}
- </h:commandLink> | </h:panelGroup>
- <h:commandLink id="create-instance-#{status.index}" action="#{portletmgr.selectPortlet}" styleClass="actionCreateInstance">
+ </h:commandLink>
+ <h:commandLink id="create-instance-#{status.index}" action="#{portletmgr.selectPortlet}" styleClass="actionCreateInstance">
<f:param name="id" value="#{portlet.context.id}"/>
<f:param name="plugin" value="createInstance"/>
#{bundle.CREATE_INSTANCE}
</h:commandLink>
+ </h:panelGrid>
</td>
</tr>
</c:forEach>
Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/accept.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/accept.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/activate.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/activate.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/add.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/add.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/coordination.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/coordination.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/deactivate.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/deactivate.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/default.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/default.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/delete.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/delete.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/generic_icon.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/generic_icon.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/layout.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/layout.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/make_default.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/make_default.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/refresh.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/refresh.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/register.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/register.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/rename.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/rename.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/security.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/security.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/settings.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/settings.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/theme.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/theme.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/window.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/window.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/window_add.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/window_add.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/window_copy.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/window_copy.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/window_edit.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/window_edit.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/window_error.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/window_error.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/window_remove.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/window_remove.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/style.css 2008-09-18 18:33:11 UTC (rev 11932)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/style.css 2008-09-18 21:46:11 UTC (rev 11933)
@@ -136,71 +136,71 @@
}
.wsrp-consumers-ui .actionConfigure {
- background-image: url( img/actionIcon_Configure.gif );
+ background-image: url( img/jbp-icon-set/settings.gif );
background-position: left;
background-repeat: no-repeat;
- line-height: 14px;
- padding-left: 18px;
+ line-height: 15px;
+ padding-left: 20px;
white-space: nowrap;
}
.wsrp-consumers-ui .actionRefresh {
- background-image: url( img/actionIcon_Refresh.gif );
+ background-image: url( img/jbp-icon-set/refresh.gif );
background-position: left;
background-repeat: no-repeat;
- line-height: 14px;
- padding-left: 18px;
+ line-height: 15px;
+ padding-left: 20px;
white-space: nowrap;
}
.wsrp-consumers-ui .actionRegister {
- background-image: url( img/actionIcon_Register.gif );
+ background-image: url( img/jbp-icon-set/register.gif );
background-position: left;
background-repeat: no-repeat;
- line-height: 14px;
- padding-left: 18px;
+ line-height: 17px;
+ padding-left: 24px;
white-space: nowrap;
}
.wsrp-consumers-ui .actionDeregister {
- background-image: url( img/actionIcon_Deregister.gif );
+ background-image: url( img/jbp-icon-set/register.gif );
background-position: left;
background-repeat: no-repeat;
- line-height: 14px;
- padding-left: 18px;
+ line-height: 17px;
+ padding-left: 24px;
white-space: nowrap;
}
.wsrp-consumers-ui .actionDelete {
- background-image: url( img/actionIcon_Delete.gif );
+ background-image: url( img/jbp-icon-set/delete.gif );
background-position: left;
background-repeat: no-repeat;
padding-top: 2px;
padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
+ line-height: 15px;
+ padding-left: 20px;
white-space: nowrap;
}
.wsrp-consumers-ui .actionActivate {
- background-image: url( img/actionIcon_Activate.gif );
+ background-image: url( img/jbp-icon-set/activate.gif );
background-position: left;
background-repeat: no-repeat;
padding-top: 2px;
padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
+ line-height: 17px;
+ padding-left: 23px;
white-space: nowrap;
}
.wsrp-consumers-ui .actionDeactivate {
- background-image: url( img/actionIcon_Deactivate.gif );
+ background-image: url( img/jbp-icon-set/deactivate.gif );
background-position: left;
background-repeat: no-repeat;
padding-top: 2px;
padding-bottom: 2px;
line-height: 18px;
- padding-left: 18px;
+ padding-left: 20px;
white-space: nowrap;
}
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11932 - in branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf: admin and 6 other directories.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-09-18 14:33:11 -0400 (Thu, 18 Sep 2008)
New Revision: 11932
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/assignRoles.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/editProfile.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/index.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/createRole.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/deleteRole.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/editRole.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/roleMembers.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/roleTemplate.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/changePassword.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/confirmPendingAction.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/createUser.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/deleteUser.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/pendingUsers.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/registerConfirm.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/registerRoles.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/resetPassword.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/searchUsers.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/userTemplate.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/confirm.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/profile.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/register.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/userInfo.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/lost.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/lostTemplate.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/changeEmail.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/changePassword.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/editProfileTemplate.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfileTemplate.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/overview.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/registerTemplate.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/startTemplate.xhtml
Log:
[JBPORTAL-2101] adding ids to identity admin ui
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/assignRoles.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/assignRoles.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/assignRoles.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -24,13 +24,13 @@
<ui:define name="content">
<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLES}" /></h3>
- <h:form>
+ <h:form id="assign-roles-form">
<h:selectManyCheckbox id="roles" value="#{assignrolemgr.roles}">
<f:selectItems value="#{identityrolemgr.roleSelectItems}" />
</h:selectManyCheckbox>
<hr/>
<p style="text-align: right;">
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{assignrolemgr.updateRoles}" styleClass="portlet-form-button"/>
+ <h:commandButton id="submit" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{assignrolemgr.updateRoles}" styleClass="portlet-form-button"/>
<h:commandButton id="cancel" action="searchUsers" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
</p>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/editProfile.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/editProfile.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/editProfile.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -10,7 +10,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ <h:commandLink id="user-managment-link" action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="pathItem">
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/index.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/index.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/index.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -18,16 +18,16 @@
fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /></h3>
- <h:form>
+ <h:form id="user-form">
<h:panelGrid>
- <h:commandLink value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}" action="searchUsers"
+ <h:commandLink id="search-user-link" value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}" action="searchUsers"
styleClass="actionDetails"/>
<c:if test="#{useradministrationbean.pendingCount > 0}">
- <h:commandLink value="Show pending registrations" action="showPendingUsers" styleClass="actionPreferences"/>
+ <h:commandLink id="pending-users-link" value="Show pending registrations" action="showPendingUsers" styleClass="actionPreferences"/>
</c:if>
- <h:commandLink value="#{bundle.IDENTITY_MANAGEMENT_CREATE_USER}" action="createUser" styleClass="actionCreateInstance"/>
+ <h:commandLink id="create-user-link" value="#{bundle.IDENTITY_MANAGEMENT_CREATE_USER}" action="createUser" styleClass="actionCreateInstance"/>
</h:panelGrid>
</h:form>
<br/>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/createRole.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/createRole.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/createRole.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -10,7 +10,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ <h:commandLink id="role-mgm-link" action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
@@ -20,7 +20,7 @@
<ui:define name="content">
<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_CREATE_ROLE}"/></h3>
-<h:form>
+<h:form id="create-role-form">
<h:panelGrid columns="3">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE}"/>
<h:inputText id="rolename" value="#{createrolemgr.uiRole.name}" required="true">
@@ -33,7 +33,7 @@
</h:panelGrid>
<hr/>
<p style="text-align: right;">
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{createrolemgr.createRole}" styleClass="portlet-form-button"/>
+ <h:commandButton id="submit" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{createrolemgr.createRole}" styleClass="portlet-form-button"/>
<h:commandButton id="cancel" action="roleAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
</p>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/deleteRole.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/deleteRole.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/deleteRole.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -11,7 +11,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ <h:commandLink id="role-mgm-link" action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="pathItem">
@@ -34,11 +34,11 @@
#{bundle.IDENTITY_WARNING_CONFIRM_DELETE_ROLE}
'#{rolemanagementbean.uiRole.name}'
</p>
- <h:form>
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="roleAdmin"
+ <h:form id="delete-role-form" >
+ <h:commandButton id="cancel" value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="roleAdmin"
styleClass="portlet-form-button portlet-section-buttonrow" />
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{rolemanagementbean.confirmedDelete}"
+ <h:commandButton id="confirm" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{rolemanagementbean.confirmedDelete}"
styleClass="portlet-form-button portlet-section-buttonrow" />
</h:form>
</div>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/editRole.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/editRole.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/editRole.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -10,7 +10,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ <h:commandLink id="role-mgm-link" action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="pathItem">
@@ -24,7 +24,7 @@
<ui:define name="content">
<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}"/></h3>
-<h:form>
+<h:form id="edit-role-link">
<h:panelGrid columns="2">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE}"/>
<h:outputText id="rolename" value="#{editrolemgr.uiRole.name}" />
@@ -34,7 +34,7 @@
</h:panelGrid>
<hr/>
<p style="text-align: right;">
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{editrolemgr.updateRole}" styleClass="portlet-form-button"/>
+ <h:commandButton id="submit" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{editrolemgr.updateRole}" styleClass="portlet-form-button"/>
<h:commandButton id="cancel" action="roleAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
</p>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/roleMembers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/roleMembers.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/roleMembers.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -10,7 +10,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ <h:commandLink id="role-admin-link" action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="pathItem">
@@ -24,8 +24,8 @@
<ui:define name="content">
<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MEMBERS}"/></h3>
-<h:form>
- <h:dataTable value="#{rolemanagementbean.roleMembers}" var="uiUser" rows="#{rolemanagementbean.limit}" rendered="#{rolemanagementbean.roleMembers.rowCount > 0}" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%">
+<h:form id="role-members-form">
+ <h:dataTable id="role-data-table" value="#{rolemanagementbean.roleMembers}" var="uiUser" rows="#{rolemanagementbean.limit}" rendered="#{rolemanagementbean.roleMembers.rowCount > 0}" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%">
<h:column>
<f:facet name="header">
<h:outputText value="#{bundle.IDENTITY_USERNAME}"/>
@@ -62,11 +62,11 @@
<f:facet name="header">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION}"/>
</f:facet>
- <h:commandLink action="#{editprofilemgr.adminEditProfile}" styleClass="actionRename">
+ <h:commandLink id="rename-link" action="#{editprofilemgr.adminEditProfile}" styleClass="actionRename">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE}"/>
<f:param name="currentUser" value="#{uiUser.UTF8Username}"/>
</h:commandLink> |
- <h:commandLink action="#{assignrolemgr.assignRoles}" styleClass="actionPreferences">
+ <h:commandLink id="assign-role-link" action="#{assignrolemgr.assignRoles}" styleClass="actionPreferences">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_ROLES}"/>
<f:param name="currentUser" value="#{uiUser.UTF8Username}"/>
</h:commandLink>
@@ -74,16 +74,16 @@
</h:dataTable>
</h:form>
<p style="text-align: center;">
- <h:commandButton value=" < " action="#{rolemanagementbean.prevPage}" rendered="#{rolemanagementbean.page > 1}" styleClass="portlet-form-button"/>
- <h:commandButton value=" > " action="#{rolemanagementbean.nextPage}" rendered="#{rolemanagementbean.roleMembers.rowCount > rolemanagementbean.limit}" styleClass="portlet-form-button"/>
+ <h:commandButton id="prev-page" value=" < " action="#{rolemanagementbean.prevPage}" rendered="#{rolemanagementbean.page > 1}" styleClass="portlet-form-button"/>
+ <h:commandButton id="next-page" value=" > " action="#{rolemanagementbean.nextPage}" rendered="#{rolemanagementbean.roleMembers.rowCount > rolemanagementbean.limit}" styleClass="portlet-form-button"/>
</p>
<br/>
<hr/>
-<h:form>
+<h:form id="search-user-form">
<h4><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/></h4>
<h:panelGrid columns="3">
<h:inputText id="searchString" value="#{rolemanagementbean.userNameFilter}" />
- <h:commandButton value="Search" action="#{rolemanagementbean.viewRoleMembers}" styleClass="portlet-form-button" />
+ <h:commandButton id="search" value="Search" action="#{rolemanagementbean.viewRoleMembers}" styleClass="portlet-form-button" />
<h:selectOneMenu id="limit" value="#{rolemanagementbean.limit}">
<f:selectItem id="limit1" itemValue="10"/>
<f:selectItem id="limit2" itemValue="20"/>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/roleTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/roleTemplate.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/roleTemplate.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -9,10 +9,10 @@
<f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<c:choose>
<c:when test="#{configurationbean.validConfiguration}">
- <h:form>
+ <h:form id="role-temp-form">
<ul class="topnav">
<li>
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}"/>
+ <h:commandLink id="manage-users" action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}"/>
</li>
<li id="currentTab"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}"/></li>
</ul>
@@ -21,7 +21,7 @@
<ui:decorate template="/jsf/common/tabContainer.xhtml">
<ui:define name="tab-object-path"><!-- Title -->
- <h:form>
+ <h:form id="role-temp-form1">
<ul class="objectpath">
<ui:insert name="title">Title</ui:insert>
</ul>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -19,7 +19,7 @@
fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
<br/>
-<h:form>
+<h:form id="roles-form">
<h:dataTable id="userlist" value="#{rolemanagementbean.roleList}" var="role" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%">
<h:column>
@@ -38,15 +38,15 @@
<f:facet name="header">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION}"/>
</f:facet>
- <h:commandLink action="#{editrolemgr.editRole}">
+ <h:commandLink id="edit-role-link" action="#{editrolemgr.editRole}">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}" styleClass="actionRename"/>
<f:param name="currentRole" value="#{role.escapedName}"/>
</h:commandLink>
- | <h:commandLink action="#{rolemanagementbean.viewRoleMembers}" styleClass="actionPreferences">
+ | <h:commandLink id="view-role-link" action="#{rolemanagementbean.viewRoleMembers}" styleClass="actionPreferences">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MEMBERS}"/>
<f:param name="currentRole" value="#{role.escapedName}"/>
</h:commandLink>
- | <h:commandLink action="#{rolemanagementbean.deleteRole}" styleClass="actionDelete">
+ | <h:commandLink id="delete-role-link" action="#{rolemanagementbean.deleteRole}" styleClass="actionDelete">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_DELETE}"/>
<f:param name="currentRole" value="#{role.escapedName}"/>
</h:commandLink>
@@ -55,8 +55,9 @@
</h:form>
<hr/>
- <h:form>
- <p style="text-align: right; padding-right: 5px;"><h:commandLink value="#{bundle.IDENTITY_MANAGEMENT_CREATE_ROLE}" action="createRole" styleClass="actionCreateInstance"/></p>
+ <h:form id="create-role-form">
+ <p style="text-align: right; padding-right: 5px;">
+ <h:commandLink id="create-role-link" value="#{bundle.IDENTITY_MANAGEMENT_CREATE_ROLE}" action="createRole" styleClass="actionCreateInstance"/></p>
</h:form>
</ui:define>
</ui:composition>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/changePassword.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/changePassword.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/changePassword.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -11,7 +11,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ <h:commandLink id="user-mgm-link" action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="pathItem">
@@ -24,7 +24,7 @@
</ui:define>
<ui:define name="content">
<h3><h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD}" /></h3>
- <h:form>
+ <h:form id="change-pwd-form">
<h:panelGrid columns="3" cellpadding="3">
<h:outputText value="#{bundle.IDENTITY_USERNAME}"/>
@@ -46,7 +46,7 @@
<hr/>
<p style="text-align: right;">
- <h:commandButton value="Submit" action="#{editprofilemgr.changePassword}" styleClass="portlet-form-button"/>
+ <h:commandButton value="submit" action="#{editprofilemgr.changePassword}" styleClass="portlet-form-button"/>
<h:commandButton id="cancel" action="searchUsers" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
</p>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/confirmPendingAction.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/confirmPendingAction.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/confirmPendingAction.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -11,11 +11,11 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ <h:commandLink id="user-mgm-link" action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="pathItem">
- <h:commandLink action="revise" value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" />
+ <h:commandLink id="revise-link" action="revise" value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
@@ -28,8 +28,8 @@
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" rendered="#{useradministrationbean.pendingUserAction == 'approve'}" />
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" rendered="#{useradministrationbean.pendingUserAction == 'reject'}" />
</h3>
-<h:form>
-<h:dataTable value="#{useradministrationbean.pendingActionList}" var="user" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%">
+<h:form id="confirm-pending-action-form">
+<h:dataTable id="confirm-pending-datatable" value="#{useradministrationbean.pendingActionList}" var="user" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%">
<h:column>
<h:selectBooleanCheckbox value="#{user.selected}" disabled="true" />
</h:column>
@@ -62,9 +62,9 @@
</h:dataTable>
<br/>
<p style="text-align: right;">
- <h:commandButton value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" action="#{useradministrationbean.confirmPendingAction}" styleClass="portlet-form-button" rendered="#{useradministrationbean.pendingUserAction == 'approve'}" />
- <h:commandButton value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" action="#{useradministrationbean.confirmPendingAction}" styleClass="portlet-form-button" rendered="#{useradministrationbean.pendingUserAction == 'reject'}" />
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="revise" styleClass="portlet-form-button"/>
+ <h:commandButton id="approve" value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" action="#{useradministrationbean.confirmPendingAction}" styleClass="portlet-form-button" rendered="#{useradministrationbean.pendingUserAction == 'approve'}" />
+ <h:commandButton id="reject" value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" action="#{useradministrationbean.confirmPendingAction}" styleClass="portlet-form-button" rendered="#{useradministrationbean.pendingUserAction == 'reject'}" />
+ <h:commandButton id="revise" value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="revise" styleClass="portlet-form-button"/>
</p>
</h:form>
</ui:define>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/createUser.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/createUser.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/createUser.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -10,7 +10,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ <h:commandLink id="user-mgm-link" action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt="I"/></li>
<li class="selected">
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/deleteUser.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/deleteUser.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/deleteUser.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -11,7 +11,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ <h:commandLink id="user-mgm-link" action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="pathItem">
@@ -35,10 +35,10 @@
'#{useradministrationbean.uiUser.username}'
</p>
<h:form>
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="searchUsers"
+ <h:commandButton id="cancel" value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="searchUsers"
styleClass="portlet-form-button portlet-section-buttonrow" />
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{useradministrationbean.confirmedDelete}"
+ <h:commandButton id="submit" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{useradministrationbean.confirmedDelete}"
styleClass="portlet-form-button portlet-section-buttonrow" />
</h:form>
</div>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/pendingUsers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/pendingUsers.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/pendingUsers.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -10,7 +10,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ <h:commandLink id="user-adm-link" action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
@@ -40,8 +40,8 @@
</script>
</f:verbatim>
<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" /></h3>
-<h:form id="pending">
-<h:dataTable value="#{useradministrationbean.pendingUsers}" var="user" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%">
+<h:form id="pending-form">
+<h:dataTable id="pending-user-datatable" value="#{useradministrationbean.pendingUsers}" var="user" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%">
<h:column>
<h:selectBooleanCheckbox id="selected" value="#{user.selected}" />
</h:column>
@@ -78,13 +78,13 @@
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION}"/>
</f:facet>
<h:outputText value="Pending" rendered="#{user.currentNode == 'validate_email'}"/>
- <h:commandLink action="#{useradministrationbean.approveRegistration}" rendered="#{user.currentNode == 'admin_approval'}" styleClass="actionDefault">
+ <h:commandLink id="approve-reg-link" action="#{useradministrationbean.approveRegistration}" rendered="#{user.currentNode == 'admin_approval'}" styleClass="actionDefault">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_APPROVE}"/>
<f:param name="processId" value="#{user.processId}" />
<f:param name="action" value="approve" />
</h:commandLink>
<h:outputText value=" | " rendered="#{user.currentNode == 'admin_approval'}" />
- <h:commandLink action="#{useradministrationbean.approveRegistration}" rendered="#{user.currentNode == 'admin_approval'}" styleClass="actionDelete">
+ <h:commandLink id="reject-reg-link" action="#{useradministrationbean.approveRegistration}" rendered="#{user.currentNode == 'admin_approval'}" styleClass="actionDelete">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REJECT}"/>
<f:param name="processId" value="#{user.processId}" />
<f:param name="action" value="reject" />
@@ -99,9 +99,9 @@
<a href="#" onClick="unSelectAll()"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_UNSELECT_ALL}" /></a>
</td>
<td style="text-align: right;">
- <h:commandButton value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" action="#{useradministrationbean.approveList}" styleClass="portlet-form-button"/>
- <h:commandButton value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" action="#{useradministrationbean.rejectList}" styleClass="portlet-form-button"/>
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="userAdmin" styleClass="portlet-form-button"/>
+ <h:commandButton id="approve" value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" action="#{useradministrationbean.approveList}" styleClass="portlet-form-button"/>
+ <h:commandButton id="reject" value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" action="#{useradministrationbean.rejectList}" styleClass="portlet-form-button"/>
+ <h:commandButton id="cancel" value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="userAdmin" styleClass="portlet-form-button"/>
</td>
</tr>
</table>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/registerConfirm.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/registerConfirm.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/registerConfirm.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -11,7 +11,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ <h:commandLink id="user-adm-link" action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/registerRoles.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/registerRoles.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/registerRoles.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -10,7 +10,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ <h:commandLink id="user-adm-link" action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="pathItem">
@@ -25,13 +25,13 @@
<ui:define name="content">
<br/>
<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLES}" /></h3>
- <h:form>
+ <h:form id="register-role-form">
<h:selectManyCheckbox id="roles" value="#{userregistermgr.roles}">
<f:selectItems value="#{identityrolemgr.roleSelectItems}" />
</h:selectManyCheckbox>
<hr/>
<p style="text-align: right;">
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="register" styleClass="portlet-form-button"/>
+ <h:commandButton id="submit" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="register" styleClass="portlet-form-button"/>
<h:commandButton id="cancel" action="#{userregistermgr.cancelRegistration}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
</p>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/resetPassword.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/resetPassword.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/resetPassword.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -10,7 +10,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ <h:commandLink id="user-adm-link" action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="pathItem">
@@ -34,11 +34,11 @@
<p class="portlet-msg-alert">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION}" />
</p>
- <h:form>
+ <h:form id="reset-pwd-form">
<h:commandButton id="cancel" action="userAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true"
styleClass="portlet-form-button portlet-section-buttonrow" />
- <h:commandButton action="#{lostpasswordmgr.doomed}" value="#{bundle.IDENTITY_BUTTON_SUBMIT}"
+ <h:commandButton id="submit" action="#{lostpasswordmgr.doomed}" value="#{bundle.IDENTITY_BUTTON_SUBMIT}"
styleClass="portlet-form-button portlet-section-buttonrow" />
</h:form>
</div>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/searchUsers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/searchUsers.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/searchUsers.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -10,7 +10,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ <h:commandLink id="user-adm-link" action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
@@ -22,7 +22,7 @@
<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/></h3>
<h:messages infoClass="portlet-msg-success" errorClass="portlet-msg-error"
fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
- <h:form>
+ <h:form id="search-user-form">
<h:panelGrid columns="4">
<h:inputText id="searchString" value="#{useradministrationbean.searchString}" />
<h:commandButton id ="search" value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}" action="#{useradministrationbean.searchUsers}" styleClass="portlet-form-button"/>
@@ -37,7 +37,7 @@
</h:panelGrid>
</h:form>
<br/>
- <h:form>
+ <h:form id="search-user-form1">
<h:dataTable id="userlist" value="#{useradministrationbean.userList}" var="uiUser" rendered="#{useradministrationbean.userList.rowCount > 0}" rows="#{useradministrationbean.limit}" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%">
<h:column>
<f:facet name="header">
@@ -75,28 +75,28 @@
<f:facet name="header">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION}"/>
</f:facet>
- <h:commandLink action="#{editprofilemgr.adminEditProfile}" styleClass="actionRename">
+ <h:commandLink id="rename-link" action="#{editprofilemgr.adminEditProfile}" styleClass="actionRename">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE}"/>
<f:param name="currentUser" value="#{uiUser.UTF8Username}"/>
</h:commandLink> |
- <h:commandLink action="#{assignrolemgr.assignRoles}" styleClass="actionProperties">
+ <h:commandLink id="assign-role-link" action="#{assignrolemgr.assignRoles}" styleClass="actionProperties">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_ROLES}"/>
<f:param name="currentUser" value="#{uiUser.UTF8Username}"/>
</h:commandLink> |
- <h:commandLink action="#{useradministrationbean.enableUser}" styleClass="#{uiUser.attribute.enabled == true ? 'actionDefault' : 'actionMakeDefault'}">
+ <h:commandLink id="enable-user-link" action="#{useradministrationbean.enableUser}" styleClass="#{uiUser.attribute.enabled == true ? 'actionDefault' : 'actionMakeDefault'}">
<h:outputText value="#{uiUser.attribute.enabled == true ? bundle.IDENTITY_MANAGEMENT_DISABLE : bundle.IDENTITY_MANAGEMENT_ENABLE}" />
<f:param name="currentUser" value="#{uiUser.UTF8Username}"/>
<f:param name="enableAction" value="#{uiUser.attribute.enabled == true ? 'disable' : 'enable'}" />
</h:commandLink> |
- <h:commandLink action="#{useradministrationbean.deleteUser}" styleClass="actionDelete">
+ <h:commandLink id="delete-user-link" action="#{useradministrationbean.deleteUser}" styleClass="actionDelete">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_DELETE}"/>
<f:param name="currentUser" value="#{uiUser.UTF8Username}"/>
</h:commandLink>
</h:column>
</h:dataTable>
<p style="text-align: center;">
- <h:commandButton value=" < " action="#{useradministrationbean.prevPage}" rendered="#{useradministrationbean.page > 1}" styleClass="portlet-form-button"/>
- <h:commandButton value=" > " action="#{useradministrationbean.nextPage}" rendered="#{useradministrationbean.userList.rowCount > useradministrationbean.limit}" styleClass="portlet-form-button"/>
+ <h:commandButton id="prev-page" value=" < " action="#{useradministrationbean.prevPage}" rendered="#{useradministrationbean.page > 1}" styleClass="portlet-form-button"/>
+ <h:commandButton id="next-page" value=" > " action="#{useradministrationbean.nextPage}" rendered="#{useradministrationbean.userList.rowCount > useradministrationbean.limit}" styleClass="portlet-form-button"/>
</p>
</h:form>
<br/>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/userTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/userTemplate.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/userTemplate.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -9,11 +9,11 @@
<f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<c:choose>
<c:when test="#{configurationbean.validConfiguration}">
- <h:form>
+ <h:form id="user-temp-form">
<ul class="topnav">
<li id="currentTab"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}"/></li>
<li>
- <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}"/>
+ <h:commandLink id="role-mgm-link" action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}"/>
</li>
</ul>
</h:form>
@@ -23,7 +23,7 @@
<ui:define name="tab-object-path">
<!-- Title -->
- <h:form>
+ <h:form id="user-temp-form1">
<ul class="objectpath">
<ui:insert name="title"><li>Title</li></ui:insert>
</ul>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/confirm.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/confirm.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/confirm.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
-<h:form>
+<h:form id="confirm-form">
<h:panelGrid columns="2">
<h:outputText value="#{bundle.IDENTITY_USERNAME}"/>
<h:outputText id="username" value="#{manager.uiUser.username}"/>
@@ -39,7 +39,7 @@
fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
<hr/>
<p style="text-align: right;">
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_EDIT}" action="revise" styleClass="portlet-form-button"/>
+ <h:commandButton id="revise" value="#{bundle.IDENTITY_BUTTON_EDIT}" action="revise" styleClass="portlet-form-button"/>
<h:commandButton id="#{subscriptionMode}" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" actionListener="#{manager.register}" action="registered" styleClass="portlet-form-button"/>
<h:commandButton id="cancel" action="#{manager.cancelRegistration}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
</p>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/profile.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/profile.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/profile.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
-<h:form>
+<h:form id="profile-form">
<ui:include src="/jsf/common/userInfo.xhtml" />
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/register.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/register.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/register.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <h:form>
+ <h:form id="register-form">
<h:panelGrid columns="2" cellpadding="3">
<h:outputText value="#{bundle.IDENTITY_USERNAME} *"/>
<h:inputText id="username" value="#{manager.uiUser.username}" required="true">
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/userInfo.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/userInfo.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/userInfo.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -48,7 +48,7 @@
<c:choose>
<c:when test="#{portletPreferenceValue.resetPassword == true}">
<h:outputText value="#{bundle.IDENTITY_PASSWORD}"/>
- <h:commandLink action="#{lostpasswordmgr.adminResetPassword}">
+ <h:commandLink id="lost-pwd-link" action="#{lostpasswordmgr.adminResetPassword}">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD}" />
<f:param name="currentUser" value="#{manager.uiUser.UTF8Username}" />
</h:commandLink>
@@ -56,7 +56,7 @@
</c:when>
<c:otherwise>
<h:outputText value="#{bundle.IDENTITY_PASSWORD}"/>
- <h:commandLink action="#{manager.adminChangePassword}">
+ <h:commandLink id="change-pwd-adm-link" action="#{manager.adminChangePassword}">
<h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD}" />
<f:param name="currentUser" value="#{manager.uiUser.UTF8Username}" />
</h:commandLink>
@@ -75,11 +75,11 @@
<h:panelGroup />
<h:panelGroup />
- <h:commandLink value="#{bundle.IDENTITY_EDIT_CHANGE_EMAIL}" action="changeEmail" />
+ <h:commandLink id="chnage-email-link" value="#{bundle.IDENTITY_EDIT_CHANGE_EMAIL}" action="changeEmail" />
<h:panelGroup />
<h:outputText value="#{bundle.IDENTITY_PASSWORD}"/>
- <h:commandLink action="changePassword">
+ <h:commandLink id="change-pwd-link" action="changePassword">
<h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD}" />
<f:param name="currentUser" value="#{manager.uiUser.UTF8Username}" />
</h:commandLink>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/lost.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/lost.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/lost.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -12,7 +12,7 @@
<h:outputText value="#{bundle.IDENTITY_LOST_PASSWORD_TITLE}" />
</ui:define>
<ui:define name="content">
-<h:form>
+<h:form id="lost-pwd-form">
<p><h:outputText value="#{bundle.IDENTITY_LOST_PASSWORD_DESCRIPTION}" /></p>
<h:panelGrid columns="2" cellpadding="3">
<h:outputText value="#{bundle.IDENTITY_USERNAME}"/>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/lostTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/lostTemplate.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/lostTemplate.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -9,13 +9,13 @@
<f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<c:choose>
<c:when test="#{configurationbean.validConfiguration}">
- <h:form>
+ <h:form id="lost-template-form">
<ul class="topnav">
<li>
- <h:commandLink value="#{bundle.IDENTITY_WELCOME}" action="start"/>
+ <h:commandLink id="start-link" value="#{bundle.IDENTITY_WELCOME}" action="start"/>
</li>
<li>
- <h:commandLink value="#{bundle.IDENTITY_REGISTER}" action="register"/>
+ <h:commandLink id="register-link" value="#{bundle.IDENTITY_REGISTER}" action="register"/>
</li>
<li id="currentTab">
<h:outputText value="#{bundle.IDENTITY_LOST_PASSWORD}" />
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/changeEmail.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/changeEmail.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/changeEmail.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -19,7 +19,7 @@
</ui:define>
<ui:define name="content">
- <h:form>
+ <h:form id="change-email-form">
<h:panelGrid columns="2" cellpadding="3">
<h:outputText value="#{bundle.IDENTITY_EDIT_PASSWORD_CURRENT}"/>
<h:inputSecret id="currentPassword" value="currentPassword" required="true">
@@ -37,7 +37,7 @@
</h:panelGrid>
<hr/>
<p style="text-align: right;">
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{editprofilemgr.changeEmail}" styleClass="portlet-form-button"/>
+ <h:commandButton id="submit" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{editprofilemgr.changeEmail}" styleClass="portlet-form-button"/>
<h:commandButton id="cancel" action="editProfile" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
</p>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/changePassword.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/changePassword.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/changePassword.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -19,7 +19,7 @@
</ui:define>
<ui:define name="content">
- <h:form>
+ <h:form id="change-pwd-form">
<h:panelGrid columns="2" cellpadding="3">
<h:outputText value="#{bundle.IDENTITY_EDIT_PASSWORD_CURRENT}"/>
<h:inputSecret id="currentPassword" value="currentPassword" required="true">
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/editProfileTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/editProfileTemplate.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/editProfileTemplate.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -10,10 +10,10 @@
<c:choose>
<c:when test="#{configurationbean.validConfiguration}">
- <h:form>
+ <h:form id="edit-prof-temp-form">
<ul class="topnav">
<li>
- <h:commandLink value="#{bundle.IDENTITY_VIEW_PROFILE_TITLE}" action="start"/>
+ <h:commandLink id="start-link" value="#{bundle.IDENTITY_VIEW_PROFILE_TITLE}" action="start"/>
</li>
<li id="currentTab"><h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" /></li>
</ul>
@@ -21,7 +21,7 @@
<ui:decorate template="/jsf/common/noTabContainer.xhtml">
<ui:define name="tab-object-path">
<!-- Title -->
- <h:form>
+ <h:form id="edit-prof-temp-form1">
<ul class="objectpath">
<ui:insert name="title">Title</ui:insert>
</ul>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfileTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfileTemplate.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfileTemplate.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -9,11 +9,11 @@
<f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<c:choose>
<c:when test="#{configurationbean.validConfiguration}">
- <h:form>
+ <h:form id="view-prof-temp-form">
<ul class="topnav">
<li id="currentTab"><h:outputText value="#{bundle.IDENTITY_VIEW_PROFILE_TITLE}" /></li>
<li>
- <h:commandLink value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" action="#{editprofilemgr.userEditProfile}"/>
+ <h:commandLink id="edit-profile-link" value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" action="#{editprofilemgr.userEditProfile}"/>
</li>
</ul>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/overview.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/overview.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/overview.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -12,8 +12,8 @@
<h:outputText value="#{bundle.IDENTITY_NOT_LOGGED_IN}" />
</ui:define>
<ui:define name="content">
- <h:form>
- <p style="text-align:center;"><h:commandLink value="#{bundle.IDENTITY_CREATE_ACCOUNT}" action="register"/></p>
+ <h:form id="create-account-form">
+ <p style="text-align:center;"><h:commandLink id="register" value="#{bundle.IDENTITY_CREATE_ACCOUNT}" action="register"/></p>
</h:form>
</ui:define>
</ui:composition>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/registerTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/registerTemplate.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/registerTemplate.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -10,10 +10,10 @@
<c:choose>
<c:when test="#{configurationbean.validConfiguration}">
- <h:form>
+ <h:form id="register-temp-form">
<ul class="topnav">
<li>
- <h:commandLink value="#{bundle.IDENTITY_WELCOME}" action="start"/>
+ <h:commandLink id="start-link" value="#{bundle.IDENTITY_WELCOME}" action="start"/>
</li>
<li id="currentTab">
<h:outputText value="#{bundle.IDENTITY_REGISTER}"/>
@@ -21,7 +21,7 @@
<!-- check if we should enable lostPassword -->
<c:if test="#{portletPreferenceValue.lostPassword == true}">
<li>
- <h:commandLink value="#{bundle.IDENTITY_LOST_PASSWORD}" action="lostPassword"/>
+ <h:commandLink id="lost-pwd-link" value="#{bundle.IDENTITY_LOST_PASSWORD}" action="lostPassword"/>
</li>
</c:if>
</ul>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/startTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/startTemplate.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/startTemplate.xhtml 2008-09-18 18:33:11 UTC (rev 11932)
@@ -10,18 +10,18 @@
<c:choose>
<c:when test="#{configurationbean.validConfiguration}">
- <h:form>
+ <h:form id="identity-template">
<ul class="topnav">
<li id="currentTab">
<h:outputText value="#{bundle.IDENTITY_WELCOME}"/>
</li>
<li>
- <h:commandLink value="#{bundle.IDENTITY_REGISTER}" action="register" />
+ <h:commandLink id="register-link" value="#{bundle.IDENTITY_REGISTER}" action="register"/>
</li>
<!-- check if we should enable lostPassword -->
<c:if test="#{portletPreferenceValue.lostPassword == true}">
<li>
- <h:commandLink value="#{bundle.IDENTITY_LOST_PASSWORD}" action="lostPassword"/>
+ <h:commandLink id="lost-pwd-link" value="#{bundle.IDENTITY_LOST_PASSWORD}" action="lostPassword"/>
</li>
</c:if>
</ul>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11931 - in branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf: admin and 6 other directories.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-09-18 14:22:08 -0400 (Thu, 18 Sep 2008)
New Revision: 11931
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/deleteRole.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/overview.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml
Log:
[JBPORTAL-2101] adding ids to identity admin ui
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -24,13 +24,13 @@
<ui:define name="content">
<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLES}" /></h3>
- <h:form>
+ <h:form id="assign-roles-form">
<h:selectManyCheckbox id="roles" value="#{assignrolemgr.roles}">
<f:selectItems value="#{identityrolemgr.roleSelectItems}" />
</h:selectManyCheckbox>
<hr/>
<p style="text-align: right;">
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{assignrolemgr.updateRoles}" styleClass="portlet-form-button"/>
+ <h:commandButton id="submit" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{assignrolemgr.updateRoles}" styleClass="portlet-form-button"/>
<h:commandButton id="cancel" action="searchUsers" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
</p>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -10,7 +10,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ <h:commandLink id="user-managment-link" action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="pathItem">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -17,16 +17,16 @@
<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /></h3>
<h:messages id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error"
fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
- <h:form>
+ <h:form id="user-form">
<h:panelGrid>
- <h:commandLink value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}" action="searchUsers"
+ <h:commandLink id="search-user-link" value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}" action="searchUsers"
styleClass="actionDetails"/>
<c:if test="#{useradministrationbean.pendingCount > 0}">
- <h:commandLink value="Show pending registrations" action="showPendingUsers" styleClass="actionPreferences"/>
+ <h:commandLink id="pending-users-link" value="Show pending registrations" action="showPendingUsers" styleClass="actionPreferences"/>
</c:if>
- <h:commandLink value="#{bundle.IDENTITY_MANAGEMENT_CREATE_USER}" action="createUser" styleClass="actionCreateInstance"/>
+ <h:commandLink id="create-user-link" value="#{bundle.IDENTITY_MANAGEMENT_CREATE_USER}" action="createUser" styleClass="actionCreateInstance"/>
</h:panelGrid>
</h:form>
<br/>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -10,7 +10,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ <h:commandLink id="role-mgm-link" action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
@@ -20,7 +20,7 @@
<ui:define name="content">
<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_CREATE_ROLE}"/></h3>
-<h:form>
+<h:form id="create-role-form">
<h:panelGrid columns="3">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE}"/>
<h:inputText id="rolename" value="#{createrolemgr.uiRole.name}" required="true">
@@ -33,7 +33,7 @@
</h:panelGrid>
<hr/>
<p style="text-align: right;">
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{createrolemgr.createRole}" styleClass="portlet-form-button"/>
+ <h:commandButton id="submit" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{createrolemgr.createRole}" styleClass="portlet-form-button"/>
<h:commandButton id="cancel" action="roleAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
</p>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/deleteRole.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/deleteRole.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/deleteRole.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -11,7 +11,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ <h:commandLink id="role-mgm-link" action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="pathItem">
@@ -34,11 +34,11 @@
#{bundle.IDENTITY_WARNING_CONFIRM_DELETE_ROLE}
#{rolemanagementbean.uiRole.name}
</p>
- <h:form>
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="roleAdmin"
+ <h:form id="delete-role-form" >
+ <h:commandButton id="cancel" value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="roleAdmin"
styleClass="portlet-form-button portlet-section-buttonrow" />
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{rolemanagementbean.confirmedDelete}"
+ <h:commandButton id="confirm" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{rolemanagementbean.confirmedDelete}"
styleClass="portlet-form-button portlet-section-buttonrow" />
</h:form>
</div>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -10,7 +10,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ <h:commandLink id="role-mgm-link" action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="pathItem">
@@ -24,7 +24,7 @@
<ui:define name="content">
<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}"/></h3>
-<h:form>
+<h:form id="edit-role-link">
<h:panelGrid columns="2">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE}"/>
<h:outputText id="rolename" value="#{editrolemgr.uiRole.name}" />
@@ -34,7 +34,7 @@
</h:panelGrid>
<hr/>
<p style="text-align: right;">
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{editrolemgr.updateRole}" styleClass="portlet-form-button"/>
+ <h:commandButton id="submit" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{editrolemgr.updateRole}" styleClass="portlet-form-button"/>
<h:commandButton id="cancel" action="roleAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
</p>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -10,7 +10,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ <h:commandLink id="role-admin-link" action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="pathItem">
@@ -24,8 +24,8 @@
<ui:define name="content">
<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MEMBERS}"/></h3>
-<h:form>
- <h:dataTable value="#{rolemanagementbean.roleMembers}" var="uiUser" rows="#{rolemanagementbean.limit}" rendered="#{rolemanagementbean.roleMembers.rowCount > 0}" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%">
+<h:form id="role-members-form">
+ <h:dataTable id="role-data-table" value="#{rolemanagementbean.roleMembers}" var="uiUser" rows="#{rolemanagementbean.limit}" rendered="#{rolemanagementbean.roleMembers.rowCount > 0}" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%">
<h:column>
<f:facet name="header">
<h:outputText value="#{bundle.IDENTITY_USERNAME}"/>
@@ -62,11 +62,11 @@
<f:facet name="header">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION}"/>
</f:facet>
- <h:commandLink action="#{editprofilemgr.adminEditProfile}" styleClass="actionRename">
+ <h:commandLink id="rename-link" action="#{editprofilemgr.adminEditProfile}" styleClass="actionRename">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE}"/>
<f:param name="currentUser" value="#{uiUser.UTF8Username}"/>
</h:commandLink> |
- <h:commandLink action="#{assignrolemgr.assignRoles}" styleClass="actionPreferences">
+ <h:commandLink id="assign-role-link" action="#{assignrolemgr.assignRoles}" styleClass="actionPreferences">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_ROLES}"/>
<f:param name="currentUser" value="#{uiUser.UTF8Username}"/>
</h:commandLink>
@@ -74,16 +74,16 @@
</h:dataTable>
</h:form>
<p style="text-align: center;">
- <h:commandButton value=" < " action="#{rolemanagementbean.prevPage}" rendered="#{rolemanagementbean.page > 1}" styleClass="portlet-form-button"/>
- <h:commandButton value=" > " action="#{rolemanagementbean.nextPage}" rendered="#{rolemanagementbean.roleMembers.rowCount > rolemanagementbean.limit}" styleClass="portlet-form-button"/>
+ <h:commandButton id="prev-page" value=" < " action="#{rolemanagementbean.prevPage}" rendered="#{rolemanagementbean.page > 1}" styleClass="portlet-form-button"/>
+ <h:commandButton id="next-page" value=" > " action="#{rolemanagementbean.nextPage}" rendered="#{rolemanagementbean.roleMembers.rowCount > rolemanagementbean.limit}" styleClass="portlet-form-button"/>
</p>
<br/>
<hr/>
-<h:form>
+<h:form id="search-user-form">
<h4><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/></h4>
<h:panelGrid columns="3">
<h:inputText id="searchString" value="#{rolemanagementbean.userNameFilter}" />
- <h:commandButton value="Search" action="#{rolemanagementbean.viewRoleMembers}" styleClass="portlet-form-button" />
+ <h:commandButton id="search" value="Search" action="#{rolemanagementbean.viewRoleMembers}" styleClass="portlet-form-button" />
<h:selectOneMenu id="limit" value="#{rolemanagementbean.limit}">
<f:selectItem id="limit1" itemValue="10"/>
<f:selectItem id="limit2" itemValue="20"/>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -9,10 +9,10 @@
<f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<c:choose>
<c:when test="#{configurationbean.validConfiguration}">
- <h:form>
+ <h:form id="role-temp-form">
<ul class="topnav">
<li>
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}"/>
+ <h:commandLink id="manage-users" action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}"/>
</li>
<li id="currentTab"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}"/></li>
</ul>
@@ -21,7 +21,7 @@
<ui:decorate template="/WEB-INF/jsf/common/tabContainer.xhtml">
<ui:define name="tab-object-path"><!-- Title -->
- <h:form>
+ <h:form id="role-temp-form1">
<ul class="objectpath">
<ui:insert name="title">Title</ui:insert>
</ul>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -19,7 +19,7 @@
fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
<br/>
-<h:form>
+<h:form id="roles-form">
<h:dataTable id="userlist" value="#{rolemanagementbean.roleList}" var="role" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%">
<h:column>
<f:facet name="header">
@@ -37,15 +37,15 @@
<f:facet name="header">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION}"/>
</f:facet>
- <h:commandLink action="#{editrolemgr.editRole}">
+ <h:commandLink id="edit-role-link" action="#{editrolemgr.editRole}">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}" styleClass="actionRename"/>
<f:param name="currentRole" value="#{role.UTF8RoleName}"/>
</h:commandLink>
- | <h:commandLink action="#{rolemanagementbean.viewRoleMembers}" styleClass="actionPreferences">
+ | <h:commandLink id="view-role-link" action="#{rolemanagementbean.viewRoleMembers}" styleClass="actionPreferences">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MEMBERS}"/>
<f:param name="currentRole" value="#{role.UTF8RoleName}"/>
</h:commandLink>
- | <h:commandLink action="#{rolemanagementbean.deleteRole}" styleClass="actionDelete">
+ | <h:commandLink id="delete-role-link" action="#{rolemanagementbean.deleteRole}" styleClass="actionDelete">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_DELETE}"/>
<f:param name="currentRole" value="#{role.UTF8RoleName}"/>
</h:commandLink>
@@ -54,8 +54,9 @@
</h:form>
<hr/>
- <h:form>
- <p style="text-align: right; padding-right: 5px;"><h:commandLink value="#{bundle.IDENTITY_MANAGEMENT_CREATE_ROLE}" action="createRole" styleClass="actionCreateInstance"/></p>
+ <h:form id="create-role-form">
+ <p style="text-align: right; padding-right: 5px;">
+ <h:commandLink id="create-role-link" value="#{bundle.IDENTITY_MANAGEMENT_CREATE_ROLE}" action="createRole" styleClass="actionCreateInstance"/></p>
</h:form>
</ui:define>
</ui:composition>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -11,7 +11,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ <h:commandLink id="user-mgm-link" action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="pathItem">
@@ -24,7 +24,7 @@
</ui:define>
<ui:define name="content">
<h3><h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD}" /></h3>
- <h:form>
+ <h:form id="change-pwd-form">
<h:panelGrid columns="3" cellpadding="3">
<h:outputText value="#{bundle.IDENTITY_USERNAME}"/>
@@ -46,7 +46,7 @@
<hr/>
<p style="text-align: right;">
- <h:commandButton value="Submit" action="#{editprofilemgr.changePassword}" styleClass="portlet-form-button"/>
+ <h:commandButton value="submit" action="#{editprofilemgr.changePassword}" styleClass="portlet-form-button"/>
<h:commandButton id="cancel" action="searchUsers" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
</p>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -11,11 +11,11 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ <h:commandLink id="user-mgm-link" action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="pathItem">
- <h:commandLink action="revise" value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" />
+ <h:commandLink id="revise-link" action="revise" value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
@@ -28,8 +28,8 @@
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" rendered="#{useradministrationbean.pendingUserAction == 'approve'}" />
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" rendered="#{useradministrationbean.pendingUserAction == 'reject'}" />
</h3>
-<h:form>
-<h:dataTable value="#{useradministrationbean.pendingActionList}" var="user" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%">
+<h:form id="confirm-pending-action-form">
+<h:dataTable id="confirm-pending-datatable" value="#{useradministrationbean.pendingActionList}" var="user" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%">
<h:column>
<h:selectBooleanCheckbox value="#{user.selected}" disabled="true" />
</h:column>
@@ -62,9 +62,9 @@
</h:dataTable>
<br/>
<p style="text-align: right;">
- <h:commandButton value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" action="#{useradministrationbean.confirmPendingAction}" styleClass="portlet-form-button" rendered="#{useradministrationbean.pendingUserAction == 'approve'}" />
- <h:commandButton value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" action="#{useradministrationbean.confirmPendingAction}" styleClass="portlet-form-button" rendered="#{useradministrationbean.pendingUserAction == 'reject'}" />
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="revise" styleClass="portlet-form-button"/>
+ <h:commandButton id="approve" value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" action="#{useradministrationbean.confirmPendingAction}" styleClass="portlet-form-button" rendered="#{useradministrationbean.pendingUserAction == 'approve'}" />
+ <h:commandButton id="reject" value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" action="#{useradministrationbean.confirmPendingAction}" styleClass="portlet-form-button" rendered="#{useradministrationbean.pendingUserAction == 'reject'}" />
+ <h:commandButton id="revise" value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="revise" styleClass="portlet-form-button"/>
</p>
</h:form>
</ui:define>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -10,7 +10,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ <h:commandLink id="user-mgm-link" action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -11,7 +11,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ <h:commandLink id="user-mgm-link" action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="pathItem">
@@ -35,10 +35,10 @@
#{useradministrationbean.uiUser.username}
</p>
<h:form>
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="searchUsers"
+ <h:commandButton id="cancel" value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="searchUsers"
styleClass="portlet-form-button portlet-section-buttonrow" />
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{useradministrationbean.confirmedDelete}"
+ <h:commandButton id="submit" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{useradministrationbean.confirmedDelete}"
styleClass="portlet-form-button portlet-section-buttonrow" />
</h:form>
</div>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -10,7 +10,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ <h:commandLink id="user-adm-link" action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
@@ -40,8 +40,8 @@
</script>
</f:verbatim>
<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" /></h3>
-<h:form id="pending">
-<h:dataTable value="#{useradministrationbean.pendingUsers}" var="user" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%">
+<h:form id="pending-form">
+<h:dataTable id="pending-user-datatable" value="#{useradministrationbean.pendingUsers}" var="user" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%">
<h:column>
<h:selectBooleanCheckbox id="selected" value="#{user.selected}" />
</h:column>
@@ -78,13 +78,13 @@
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION}"/>
</f:facet>
<h:outputText value="Pending" rendered="#{user.currentNode == 'validate_email'}"/>
- <h:commandLink action="#{useradministrationbean.approveRegistration}" rendered="#{user.currentNode == 'admin_approval'}" styleClass="actionDefault">
+ <h:commandLink id="approve-reg-link" action="#{useradministrationbean.approveRegistration}" rendered="#{user.currentNode == 'admin_approval'}" styleClass="actionDefault">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_APPROVE}"/>
<f:param name="processId" value="#{user.processId}" />
<f:param name="action" value="approve" />
</h:commandLink>
<h:outputText value=" | " rendered="#{user.currentNode == 'admin_approval'}" />
- <h:commandLink action="#{useradministrationbean.approveRegistration}" rendered="#{user.currentNode == 'admin_approval'}" styleClass="actionDelete">
+ <h:commandLink id="reject-reg-link" action="#{useradministrationbean.approveRegistration}" rendered="#{user.currentNode == 'admin_approval'}" styleClass="actionDelete">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REJECT}"/>
<f:param name="processId" value="#{user.processId}" />
<f:param name="action" value="reject" />
@@ -99,9 +99,9 @@
<a href="#" onClick="unSelectAll()"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_UNSELECT_ALL}" /></a>
</td>
<td style="text-align: right;">
- <h:commandButton value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" action="#{useradministrationbean.approveList}" styleClass="portlet-form-button"/>
- <h:commandButton value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" action="#{useradministrationbean.rejectList}" styleClass="portlet-form-button"/>
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="userAdmin" styleClass="portlet-form-button"/>
+ <h:commandButton id="approve" value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" action="#{useradministrationbean.approveList}" styleClass="portlet-form-button"/>
+ <h:commandButton id="reject" value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" action="#{useradministrationbean.rejectList}" styleClass="portlet-form-button"/>
+ <h:commandButton id="cancel" value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="userAdmin" styleClass="portlet-form-button"/>
</td>
</tr>
</table>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -11,7 +11,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ <h:commandLink id="user-adm-link" action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -10,7 +10,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ <h:commandLink id="user-adm-link" action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="pathItem">
@@ -25,13 +25,13 @@
<ui:define name="content">
<br/>
<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLES}" /></h3>
- <h:form>
+ <h:form id="register-role-form">
<h:selectManyCheckbox id="roles" value="#{userregistermgr.roles}">
<f:selectItems value="#{identityrolemgr.roleSelectItems}" />
</h:selectManyCheckbox>
<hr/>
<p style="text-align: right;">
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="register" styleClass="portlet-form-button"/>
+ <h:commandButton id="submit" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="register" styleClass="portlet-form-button"/>
<h:commandButton id="cancel" action="#{userregistermgr.cancelRegistration}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
</p>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -10,7 +10,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ <h:commandLink id="user-adm-link" action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="pathItem">
@@ -34,11 +34,11 @@
<p class="portlet-msg-alert">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION}" />
</p>
- <h:form>
+ <h:form id="reset-pwd-form">
<h:commandButton id="cancel" action="userAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true"
styleClass="portlet-form-button portlet-section-buttonrow" />
- <h:commandButton action="#{lostpasswordmgr.doomed}" value="#{bundle.IDENTITY_BUTTON_SUBMIT}"
+ <h:commandButton id="submit" action="#{lostpasswordmgr.doomed}" value="#{bundle.IDENTITY_BUTTON_SUBMIT}"
styleClass="portlet-form-button portlet-section-buttonrow" />
</h:form>
</div>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -10,7 +10,7 @@
<ui:define name="title">
<li class="pathItem">
- <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ <h:commandLink id="user-adm-link" action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
@@ -22,7 +22,7 @@
<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/></h3>
<h:messages infoClass="portlet-msg-success" errorClass="portlet-msg-error"
fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
- <h:form>
+ <h:form id="search-user-form">
<h:panelGrid columns="4">
<h:inputText id="searchString" value="#{useradministrationbean.searchString}" />
<h:commandButton id ="search" value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}" action="#{useradministrationbean.searchUsers}" styleClass="portlet-form-button"/>
@@ -37,7 +37,7 @@
</h:panelGrid>
</h:form>
<br/>
- <h:form>
+ <h:form id="search-user-form1">
<h:dataTable id="userlist" value="#{useradministrationbean.userList}" var="uiUser" rendered="#{useradministrationbean.userList.rowCount > 0}" rows="#{useradministrationbean.limit}" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%">
<h:column>
<f:facet name="header">
@@ -75,28 +75,28 @@
<f:facet name="header">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION}"/>
</f:facet>
- <h:commandLink action="#{editprofilemgr.adminEditProfile}" styleClass="actionRename">
+ <h:commandLink id="rename-link" action="#{editprofilemgr.adminEditProfile}" styleClass="actionRename">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE}"/>
<f:param name="currentUser" value="#{uiUser.UTF8Username}"/>
</h:commandLink> |
- <h:commandLink action="#{assignrolemgr.assignRoles}" styleClass="actionProperties">
+ <h:commandLink id="assign-role-link" action="#{assignrolemgr.assignRoles}" styleClass="actionProperties">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_ROLES}"/>
<f:param name="currentUser" value="#{uiUser.UTF8Username}"/>
</h:commandLink> |
- <h:commandLink action="#{useradministrationbean.enableUser}" styleClass="#{uiUser.attribute.enabled == true ? 'actionDefault' : 'actionMakeDefault'}">
+ <h:commandLink id="enable-user-link" action="#{useradministrationbean.enableUser}" styleClass="#{uiUser.attribute.enabled == true ? 'actionDefault' : 'actionMakeDefault'}">
<h:outputText value="#{uiUser.attribute.enabled == true ? bundle.IDENTITY_MANAGEMENT_DISABLE : bundle.IDENTITY_MANAGEMENT_ENABLE}" />
<f:param name="currentUser" value="#{uiUser.UTF8Username}"/>
<f:param name="enableAction" value="#{uiUser.attribute.enabled == true ? 'disable' : 'enable'}" />
</h:commandLink> |
- <h:commandLink action="#{useradministrationbean.deleteUser}" styleClass="actionDelete">
+ <h:commandLink id="delete-user-link" action="#{useradministrationbean.deleteUser}" styleClass="actionDelete">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_DELETE}"/>
<f:param name="currentUser" value="#{uiUser.UTF8Username}"/>
</h:commandLink>
</h:column>
</h:dataTable>
<p style="text-align: center;">
- <h:commandButton value=" < " action="#{useradministrationbean.prevPage}" rendered="#{useradministrationbean.page > 1}" styleClass="portlet-form-button"/>
- <h:commandButton value=" > " action="#{useradministrationbean.nextPage}" rendered="#{useradministrationbean.userList.rowCount > useradministrationbean.limit}" styleClass="portlet-form-button"/>
+ <h:commandButton id="prev-page" value=" < " action="#{useradministrationbean.prevPage}" rendered="#{useradministrationbean.page > 1}" styleClass="portlet-form-button"/>
+ <h:commandButton id="next-page" value=" > " action="#{useradministrationbean.nextPage}" rendered="#{useradministrationbean.userList.rowCount > useradministrationbean.limit}" styleClass="portlet-form-button"/>
</p>
</h:form>
<br/>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -9,11 +9,11 @@
<f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<c:choose>
<c:when test="#{configurationbean.validConfiguration}">
- <h:form>
+ <h:form id="user-temp-form">
<ul class="topnav">
<li id="currentTab"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}"/></li>
<li>
- <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}"/>
+ <h:commandLink id="role-mgm-link" action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}"/>
</li>
</ul>
</h:form>
@@ -23,7 +23,7 @@
<ui:define name="tab-object-path">
<!-- Title -->
- <h:form>
+ <h:form id="user-temp-form1">
<ul class="objectpath">
<ui:insert name="title"><li>Title</li></ui:insert>
</ul>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
-<h:form>
+<h:form id="confirm-form">
<h:panelGrid columns="2">
<h:outputText value="#{bundle.IDENTITY_USERNAME}"/>
<h:outputText id="username" value="#{manager.uiUser.username}"/>
@@ -30,7 +30,7 @@
<h:messages />
<hr/>
<p style="text-align: right;">
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_EDIT}" action="revise" styleClass="portlet-form-button"/>
+ <h:commandButton id="revise" value="#{bundle.IDENTITY_BUTTON_EDIT}" action="revise" styleClass="portlet-form-button"/>
<h:commandButton id="#{subscriptionMode}" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" actionListener="#{manager.register}" action="registered" styleClass="portlet-form-button"/>
<h:commandButton id="cancel" action="#{manager.cancelRegistration}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
</p>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
-<h:form>
+<h:form id="profile-form">
<ui:include src="/WEB-INF/jsf/common/userInfo.xhtml" />
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <h:form>
+ <h:form id="register-form">
<h:panelGrid columns="2" cellpadding="3">
<h:outputText value="#{bundle.IDENTITY_USERNAME} *"/>
<h:inputText id="username" value="#{manager.uiUser.username}" required="true">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/userInfo.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -48,7 +48,7 @@
<c:choose>
<c:when test="#{portletPreferenceValue.resetPassword == true}">
<h:outputText value="#{bundle.IDENTITY_PASSWORD}"/>
- <h:commandLink action="#{lostpasswordmgr.adminResetPassword}">
+ <h:commandLink id="lost-pwd-link" action="#{lostpasswordmgr.adminResetPassword}">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD}" />
<f:param name="currentUser" value="#{manager.uiUser.UTF8Username}" />
</h:commandLink>
@@ -56,7 +56,7 @@
</c:when>
<c:otherwise>
<h:outputText value="#{bundle.IDENTITY_PASSWORD}"/>
- <h:commandLink action="#{manager.adminChangePassword}">
+ <h:commandLink id="change-pwd-adm-link" action="#{manager.adminChangePassword}">
<h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD}" />
<f:param name="currentUser" value="#{manager.uiUser.UTF8Username}" />
</h:commandLink>
@@ -75,11 +75,11 @@
<h:panelGroup />
<h:panelGroup />
- <h:commandLink value="#{bundle.IDENTITY_EDIT_CHANGE_EMAIL}" action="changeEmail" />
+ <h:commandLink id="chnage-email-link" value="#{bundle.IDENTITY_EDIT_CHANGE_EMAIL}" action="changeEmail" />
<h:panelGroup />
<h:outputText value="#{bundle.IDENTITY_PASSWORD}"/>
- <h:commandLink action="changePassword">
+ <h:commandLink id="change-pwd-link" action="changePassword">
<h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD}" />
<f:param name="currentUser" value="#{manager.uiUser.UTF8Username}" />
</h:commandLink>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -12,7 +12,7 @@
<h:outputText value="#{bundle.IDENTITY_LOST_PASSWORD_TITLE}" />
</ui:define>
<ui:define name="content">
-<h:form>
+<h:form id="lost-pwd-form">
<p><h:outputText value="#{bundle.IDENTITY_LOST_PASSWORD_DESCRIPTION}" /></p>
<h:panelGrid columns="2" cellpadding="3">
<h:outputText value="#{bundle.IDENTITY_USERNAME}"/>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -9,13 +9,13 @@
<f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<c:choose>
<c:when test="#{configurationbean.validConfiguration}">
- <h:form>
+ <h:form id="lost-template-form">
<ul class="topnav">
<li>
- <h:commandLink value="#{bundle.IDENTITY_WELCOME}" action="start"/>
+ <h:commandLink id="start-link" value="#{bundle.IDENTITY_WELCOME}" action="start"/>
</li>
<li>
- <h:commandLink value="#{bundle.IDENTITY_REGISTER}" action="register"/>
+ <h:commandLink id="register-link" value="#{bundle.IDENTITY_REGISTER}" action="register"/>
</li>
<li id="currentTab">
<h:outputText value="#{bundle.IDENTITY_LOST_PASSWORD}" />
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -19,7 +19,7 @@
</ui:define>
<ui:define name="content">
- <h:form>
+ <h:form id="change-email-form">
<h:panelGrid columns="2" cellpadding="3">
<h:outputText value="#{bundle.IDENTITY_EDIT_PASSWORD_CURRENT}"/>
<h:inputSecret id="currentPassword" value="currentPassword" required="true">
@@ -37,7 +37,7 @@
</h:panelGrid>
<hr/>
<p style="text-align: right;">
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{editprofilemgr.changeEmail}" styleClass="portlet-form-button"/>
+ <h:commandButton id="submit" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{editprofilemgr.changeEmail}" styleClass="portlet-form-button"/>
<h:commandButton id="cancel" action="editProfile" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
</p>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -19,7 +19,7 @@
</ui:define>
<ui:define name="content">
- <h:form>
+ <h:form id="change-pwd-form">
<h:panelGrid columns="2" cellpadding="3">
<h:outputText value="#{bundle.IDENTITY_EDIT_PASSWORD_CURRENT}"/>
<h:inputSecret id="currentPassword" value="currentPassword" required="true">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -10,10 +10,10 @@
<c:choose>
<c:when test="#{configurationbean.validConfiguration}">
- <h:form>
+ <h:form id="edit-prof-temp-form">
<ul class="topnav">
<li>
- <h:commandLink value="#{bundle.IDENTITY_VIEW_PROFILE_TITLE}" action="start"/>
+ <h:commandLink id="start-link" value="#{bundle.IDENTITY_VIEW_PROFILE_TITLE}" action="start"/>
</li>
<li id="currentTab"><h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" /></li>
</ul>
@@ -21,7 +21,7 @@
<ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml">
<ui:define name="tab-object-path">
<!-- Title -->
- <h:form>
+ <h:form id="edit-prof-temp-form1">
<ul class="objectpath">
<ui:insert name="title">Title</ui:insert>
</ul>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -9,11 +9,11 @@
<f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<c:choose>
<c:when test="#{configurationbean.validConfiguration}">
- <h:form>
+ <h:form id="view-prof-temp-form">
<ul class="topnav">
<li id="currentTab"><h:outputText value="#{bundle.IDENTITY_VIEW_PROFILE_TITLE}" /></li>
<li>
- <h:commandLink value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" action="#{editprofilemgr.userEditProfile}"/>
+ <h:commandLink id="edit-profile-link" value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" action="#{editprofilemgr.userEditProfile}"/>
</li>
</ul>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/overview.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/overview.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/overview.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -12,8 +12,8 @@
<h:outputText value="#{bundle.IDENTITY_NOT_LOGGED_IN}" />
</ui:define>
<ui:define name="content">
- <h:form>
- <p style="text-align:center;"><h:commandLink value="#{bundle.IDENTITY_CREATE_ACCOUNT}" action="register"/></p>
+ <h:form id="create-account-form">
+ <p style="text-align:center;"><h:commandLink id="register" value="#{bundle.IDENTITY_CREATE_ACCOUNT}" action="register"/></p>
</h:form>
</ui:define>
</ui:composition>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -10,10 +10,10 @@
<c:choose>
<c:when test="#{configurationbean.validConfiguration}">
- <h:form>
+ <h:form id="register-temp-form">
<ul class="topnav">
<li>
- <h:commandLink value="#{bundle.IDENTITY_WELCOME}" action="start"/>
+ <h:commandLink id="start-link" value="#{bundle.IDENTITY_WELCOME}" action="start"/>
</li>
<li id="currentTab">
<h:outputText value="#{bundle.IDENTITY_REGISTER}"/>
@@ -21,7 +21,7 @@
<!-- check if we should enable lostPassword -->
<c:if test="#{portletPreferenceValue.lostPassword == true}">
<li>
- <h:commandLink value="#{bundle.IDENTITY_LOST_PASSWORD}" action="lostPassword"/>
+ <h:commandLink id="lost-pwd-link" value="#{bundle.IDENTITY_LOST_PASSWORD}" action="lostPassword"/>
</li>
</c:if>
</ul>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml 2008-09-18 18:22:08 UTC (rev 11931)
@@ -10,18 +10,18 @@
<c:choose>
<c:when test="#{configurationbean.validConfiguration}">
- <h:form>
+ <h:form id="identity-template">
<ul class="topnav">
<li id="currentTab">
<h:outputText value="#{bundle.IDENTITY_WELCOME}"/>
</li>
<li>
- <h:commandLink value="#{bundle.IDENTITY_REGISTER}" action="register"/>
+ <h:commandLink id="register-link" value="#{bundle.IDENTITY_REGISTER}" action="register"/>
</li>
<!-- check if we should enable lostPassword -->
<c:if test="#{portletPreferenceValue.lostPassword == true}">
<li>
- <h:commandLink value="#{bundle.IDENTITY_LOST_PASSWORD}" action="lostPassword"/>
+ <h:commandLink id="lost-pwd-link" value="#{bundle.IDENTITY_LOST_PASSWORD}" action="lostPassword"/>
</li>
</c:if>
</ul>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11930 - branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-09-18 10:57:40 -0400 (Thu, 18 Sep 2008)
New Revision: 11930
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml
Log:
[JBPORTAL-2104]more ids for dashboard
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml 2008-09-18 11:07:59 UTC (rev 11929)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml 2008-09-18 14:57:40 UTC (rev 11930)
@@ -23,10 +23,10 @@
<table class="bottombuttonbar">
<tr>
<td align="left" valign="top"><b>#{bundle.DASHBOARD_CREATE_NEW_PAGE}:</b><br/>#{bundle.DASHBOARD_CREATE_PAGE}: 
- <h:form style="padding:0;margin:0">
+ <h:form id="dashboard-form" style="padding:0;margin:0">
<h:inputText id="pageName" value="#{addDashboardPageAction.pageName}"
styleClass="portlet-form-input-field"/>
- <h:commandButton value="#{bundle.SAVE}"
+ <h:commandButton value="#{bundle.SAVE}" id="save-button"
action="#{addDashboardPageAction.execute}"
styleClass="portlet-form-button"/>
</h:form>
@@ -39,7 +39,7 @@
<h:message for="newName"/>
<h:inputText id="newName" value="#{renameDashboardPageAction.newName}"
styleClass="portlet-form-input-field"/>
- <h:commandButton value="#{bundle.RENAME}"
+ <h:commandButton value="#{bundle.RENAME}" id="rename-button"
action="#{renameDashboardPageAction.execute}"
styleClass="portlet-form-button"/>
</h:form>
@@ -61,7 +61,7 @@
</tr>
<tr>
<td class="portlet-section-body" align="center">
- <h:form id="page_selector_form" style="padding:0;margin:0">
+ <h:form id="page-selector-form" style="padding:0;margin:0">
Select: <h:selectOneMenu
id="pageNameSelector"
value="#{dashboard.selectedPageName}"
@@ -98,7 +98,7 @@
styleClass="portlet-form-field">
<f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/>
</h:selectOneMenu>
- <h:commandButton value="#{bundle.DASHBOARD_SELECT}" styleClass="portlet-form-button"
+ <h:commandButton id="update-layout" value="#{bundle.DASHBOARD_SELECT}" styleClass="portlet-form-button"
action="#{dashboard.updateLayout}"/>
</h:form>
</td>
@@ -116,7 +116,7 @@
styleClass="portlet-form-field">
<f:selectItems value="#{applicationScope.ThemeService.themeItems}"/>
</h:selectOneMenu>
- <h:commandButton value="#{bundle.DASHBOARD_SELECT}" styleClass="portlet-form-button"
+ <h:commandButton id="update-theme" value="#{bundle.DASHBOARD_SELECT}" styleClass="portlet-form-button"
action="#{dashboard.updateTheme}"/>
</h:form>
</td>
@@ -150,7 +150,7 @@
<tr>
<td align="left">
<h:form style="padding:0;margin:0">
- <h:commandButton value="#{bundle.DASHBOARD_DELETE_THIS_PAGE}" styleClass="portlet-form-button"
+ <h:commandButton id="destroy" value="#{bundle.DASHBOARD_DELETE_THIS_PAGE}" styleClass="portlet-form-button"
action="#{dashboard.destroyPage}"/>
<br/>
<font color="red">#{bundle.DASHBOARD_CANNOT_UNDO_ACTION}!</font>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11929 - in modules/web/trunk/web/src/test: resources/config and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-18 07:07:59 -0400 (Thu, 18 Sep 2008)
New Revision: 11929
Modified:
modules/web/trunk/web/src/test/build.xml
modules/web/trunk/web/src/test/resources/config/servers.xml
Log:
Added 4.2.3
Modified: modules/web/trunk/web/src/test/build.xml
===================================================================
--- modules/web/trunk/web/src/test/build.xml 2008-09-18 06:20:52 UTC (rev 11928)
+++ modules/web/trunk/web/src/test/build.xml 2008-09-18 11:07:59 UTC (rev 11929)
@@ -68,6 +68,14 @@
<property environment="env"/>
<!--If properties are not in command line check if they are set in env-->
+ <condition property="JBOSS_4_2_3_HOME" value="${env.JBOSS_4_2_3_HOME}">
+ <and>
+ <isset property="env.JBOSS_4_2_3_HOME"/>
+ <not>
+ <isset property="JBOSS_4_2_3_HOME"/>
+ </not>
+ </and>
+ </condition>
<condition property="JBOSS_4_2_2_HOME" value="${env.JBOSS_4_2_2_HOME}">
<and>
<isset property="env.JBOSS_4_2_2_HOME"/>
@@ -117,7 +125,7 @@
</and>
</condition>
- <fail message="Please set the environment variable JBOSS_4_2_0_HOME or JBOSS_4_2_1_HOME or JBOSS_4_2_2_HOME">
+ <fail message="Please set the environment variable JBOSS_4_2_0_HOME or JBOSS_4_2_1_HOME or JBOSS_4_2_2_HOME or JBOSS_4_2_3_HOME">
<condition>
<and>
<not>
@@ -129,9 +137,12 @@
<not>
<isset property="JBOSS_4_2_1_HOME"/>
</not>
- <not>
+ <not>
<isset property="JBOSS_4_2_2_HOME"/>
</not>
+ <not>
+ <isset property="JBOSS_4_2_3_HOME"/>
+ </not>
</and>
</condition>
</fail>
@@ -714,6 +725,10 @@
<param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_2"/>
<param name="test.jboss-4.2.home" value="${JBOSS_4_2_2_HOME}"/>
</antcall>
+ <antcall target="tests.jboss-4.2.spi">
+ <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_3"/>
+ <param name="test.jboss-4.2.home" value="${JBOSS_4_2_3_HOME}"/>
+ </antcall>
<!-- endpoint tests -->
@@ -729,6 +744,10 @@
<param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_2"/>
<param name="test.jboss-4.2.home" value="${JBOSS_4_2_2_HOME}"/>
</antcall>
+ <antcall target="tests.jboss-4.2.endpoint">
+ <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_3"/>
+ <param name="test.jboss-4.2.home" value="${JBOSS_4_2_3_HOME}"/>
+ </antcall>
</target>
<target name="cargo.jboss-5.0.start" depends="cargo.setup">
Modified: modules/web/trunk/web/src/test/resources/config/servers.xml
===================================================================
--- modules/web/trunk/web/src/test/resources/config/servers.xml 2008-09-18 06:20:52 UTC (rev 11928)
+++ modules/web/trunk/web/src/test/resources/config/servers.xml 2008-09-18 11:07:59 UTC (rev 11929)
@@ -79,7 +79,7 @@
</deployer>
</node>
</server>
- <server>
+ <server>
<server-name>RemoteJBoss_4_2_2</server-name>
<node>
<node-id>default</node-id>
@@ -98,6 +98,24 @@
</node>
</server>
<server>
+ <server-name>RemoteJBoss_4_2_3</server-name>
+ <node>
+ <node-id>default</node-id>
+ <service>
+ <service-name>TestDriverServer</service-name>
+ <interface>org.jboss.unit.remote.driver.RemoteTestDriver</interface>
+ <uri>socket://localhost:5400</uri>
+ </service>
+ <deployer>
+ <remote>
+ <name>jboss4x</name>
+ <host>localhost</host>
+ <port>8080</port>
+ </remote>
+ </deployer>
+ </node>
+ </server>
+ <server>
<server-name>RemoteJBoss_5_0</server-name>
<node>
<node-id>default</node-id>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11928 - branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2008-09-18 02:20:52 -0400 (Thu, 18 Sep 2008)
New Revision: 11928
Modified:
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublishImpl.java
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/FinalizePublish.java
Log:
JBPORTAL-2159 - ApprovePublish workflow throws exception when updated content exceeds column width of JBPM_VARIABLEINSTANCE.STRINGVALUE_ (255 bytes)
Modified: branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublishImpl.java
===================================================================
--- branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublishImpl.java 2008-09-18 04:12:53 UTC (rev 11927)
+++ branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublishImpl.java 2008-09-18 06:20:52 UTC (rev 11928)
@@ -464,7 +464,7 @@
}
processInstance.getContextInstance().setVariable("approved", new Boolean(true));
- processInstance.getContextInstance().setVariable("modifiedContent", modifiedContent);
+ processInstance.getContextInstance().setVariable("modifiedContent", modifiedContent.getBytes());
Collection allTasks = processInstance.getTaskMgmtInstance().getTaskInstances();
if (allTasks != null)
Modified: branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/FinalizePublish.java
===================================================================
--- branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/FinalizePublish.java 2008-09-18 04:12:53 UTC (rev 11927)
+++ branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/FinalizePublish.java 2008-09-18 06:20:52 UTC (rev 11928)
@@ -54,7 +54,7 @@
{
Content content = (Content)executionContext.getContextInstance().getVariable("content");
boolean approved = ((Boolean)executionContext.getContextInstance().getVariable("approved")).booleanValue();
- String modifiedContent = (String)executionContext.getContextInstance().getVariable("modifiedContent");
+ byte[] modifiedContent = (byte[])executionContext.getContextInstance().getVariable("modifiedContent");
long processId = executionContext.getProcessInstance().getId();
CMS cms = this.getCMSService();
@@ -83,9 +83,9 @@
new Locale(language));
File file = (File)cms.execute(command);
- if(modifiedContent != null && modifiedContent.trim().length()>0)
+ if(modifiedContent != null)
{
- file.getContent().setBytes(modifiedContent.getBytes());
+ file.getContent().setBytes(modifiedContent);
}
//now publish this
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11927 - in branches/JBoss_Portal_2_6_6_JBPORTAL-2109: core-cms/src/main/org/jboss/portal/core/cms/ui/admin and 2 other directories.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2008-09-18 00:12:53 -0400 (Thu, 18 Sep 2008)
New Revision: 11927
Added:
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/accessdenied.jsp
Modified:
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublishImpl.java
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
Log:
JBPORTAL-2155 - Any CMS user can access secured cms items through preview function - (only a patch for the customer). This code should not go into 2.6 and 2.7 codebase. A much cleaner approach to be used for 2.6 and 2.7
Modified: branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublishImpl.java
===================================================================
--- branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublishImpl.java 2008-09-17 22:20:20 UTC (rev 11926)
+++ branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublishImpl.java 2008-09-18 04:12:53 UTC (rev 11927)
@@ -159,7 +159,7 @@
this.managerSet = new HashSet();
for (int i = 0; i < managers.length; i++)
{
- this.managers[i] = st.nextToken();
+ this.managers[i] = st.nextToken().trim();
this.managerSet.add(this.managers[i]);
}
Modified: branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java
===================================================================
--- branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-09-17 22:20:20 UTC (rev 11926)
+++ branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-09-18 04:12:53 UTC (rev 11927)
@@ -158,7 +158,7 @@
//check and make sure the CMSAdminPortlet is accessible to the current user
if (!this.isPortletAccessible(rReq))
{
- this.showAccessDeniedScreen(rRes);
+ this.showAccessDeniedScreen(rReq, rRes);
return;
}
@@ -168,7 +168,7 @@
{
if (!this.isSecurityConsoleAccessible(rReq))
{
- this.showAccessDeniedScreen(rRes);
+ this.showAccessDeniedScreen(rReq, rRes);
return;
}
}
@@ -177,7 +177,7 @@
{
if (rReq.getParameter("accessDenied") != null)
{
- this.showAccessDeniedScreen(rRes);
+ this.showAccessDeniedScreen(rReq, rRes);
}
else
{
@@ -188,7 +188,7 @@
{
if (e.toString().indexOf("Access to this resource is denied") != -1)
{
- this.showAccessDeniedScreen(rRes);
+ this.showAccessDeniedScreen(rReq, rRes);
}
else
{
@@ -202,23 +202,24 @@
* @param renderResponse
* @throws IOException
*/
- private void showAccessDeniedScreen(JBossRenderResponse renderResponse) throws IOException
+ private void showAccessDeniedScreen(JBossRenderRequest rReq, JBossRenderResponse rRes) throws IOException, PortletException
{
- renderResponse.setContentType("text/html");
- PrintWriter writer = null;
- try
- {
- writer = renderResponse.getWriter();
- String sHTML = "<h2>Access Denied</h2>";
- writer.write(sHTML);
- }
- finally
- {
- if(writer != null)
+ try
{
- writer.close();
+ String sPath = rReq.getParameter("path");
+ String sOp = rReq.getParameter("returnOp");
+
+
+ rRes.setContentType("text/html");
+ rReq.setAttribute("path", sPath);
+ rReq.setAttribute("returnOp", sOp);
+ javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/accessdenied.jsp");
+ prd.include(rReq, rRes);
}
- }
+ catch(Exception e)
+ {
+ throw new PortletException(e);
+ }
}
private void internalDoView(JBossRenderRequest rReq, JBossRenderResponse rRes)
@@ -732,6 +733,13 @@
}
else if (CMSAdminConstants.OP_VIEWPENDING.equals(op))
{
+ boolean isWorkflowManagementAccessible = this.isWorkflowManagementAccessible(rReq);
+ if(!isWorkflowManagementAccessible)
+ {
+ this.showAccessDeniedScreen(rReq, rRes);
+ return;
+ }
+
String sPath = rReq.getParameter("path");
if (this.getApprovePublish() != null)
@@ -759,6 +767,20 @@
String path = rReq.getParameter("path");
String contentPath = rReq.getParameter("contentPath");
+ boolean isWorkflowManagementAccessible = this.isWorkflowManagementAccessible(rReq);
+ if(!isWorkflowManagementAccessible)
+ {
+ this.showAccessDeniedScreen(rReq, rRes);
+ return;
+ }
+
+ boolean hasWriteAccess = this.hasWriteAccess(rReq, path);
+ if(!hasWriteAccess)
+ {
+ this.showAccessDeniedScreen(rReq, rRes);
+ return;
+ }
+
if (this.getApprovePublish() != null)
{
try
@@ -1370,6 +1392,12 @@
}
else if (CMSAdminConstants.OP_APPROVE.equals(op))
{
+ boolean hasWriteAccess = this.hasWriteAccess(aReq, aReq.getParameter("path"));
+ if(!hasWriteAccess)
+ {
+ throw new CMSException("Access to this resource is denied");
+ }
+
String sManager = aReq.getUser().getUserName();
String sPID = aReq.getParameter("pid");
try
@@ -1398,6 +1426,12 @@
}
else if (CMSAdminConstants.OP_DENY.equals(op))
{
+ boolean hasWriteAccess = this.hasWriteAccess(aReq, aReq.getParameter("path"));
+ if(!hasWriteAccess)
+ {
+ throw new CMSException("Access to this resource is denied");
+ }
+
String sManager = aReq.getUser().getUserName();
String sPID = aReq.getParameter("pid");
try
@@ -1449,6 +1483,12 @@
}
else if(CMSAdminConstants.OP_MODIFYANDAPPROVE.equals(op))
{
+ boolean hasWriteAccess = this.hasWriteAccess(aReq, aReq.getParameter("path"));
+ if(!hasWriteAccess)
+ {
+ throw new CMSException("Access to this resource is denied");
+ }
+
String modifiedContent = aReq.getParameter("elm1");
String processId = aReq.getParameter("pid");
String path = aReq.getParameter("path");
@@ -1838,4 +1878,38 @@
{
}
+
+ private boolean hasWriteAccess(PortletRequest request, String path)
+ {
+ boolean hasAccess = false;
+
+ User user = null;
+ if(request instanceof JBossRenderRequest)
+ {
+ user = ((JBossRenderRequest)request).getUser();
+ }
+ else if(request instanceof JBossActionRequest)
+ {
+ user = ((JBossActionRequest)request).getUser();
+ }
+
+ try
+ {
+ user = userModule.findUserById(user.getId());
+ }
+ catch (Exception e)
+ {
+ return false;
+ }
+
+ PortalCMSSecurityContext securityContext = new PortalCMSSecurityContext(user);
+ File file = new FileImpl();
+ file.setBasePath(path);
+ securityContext.setAttribute("command", CMSService.getCommandFactory().createFileUpdateCommand(file));
+
+ PortalPermission cmsPermission = new CMSPermission(securityContext);
+ hasAccess = this.authorizationManager.checkPermission(cmsPermission);
+
+ return hasAccess;
+ }
}
\ No newline at end of file
Modified: branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-09-17 22:20:20 UTC (rev 11926)
+++ branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-09-18 04:12:53 UTC (rev 11927)
@@ -131,3 +131,7 @@
CMS_ADMIN_SELECT_ROLES=Select Roles that have access to this node.
CMS_ADMIN_SELECT_USERS=Select Users that have access to this node.
CMS_ADMIN_YOU_CAN_SELECT_CTRL_ROLES=You may select multiple roles by using CTRL+click on the role names.
+
+CMS_ACCESS_DENIED=Access Denied
+CMS_ACCESS_DENIED_DESCRIPTION=You are not allowed to access this resource
+CMS_ACCESS_DENIED_DESCRIPTION_PATH=You are not allowed to access the resource
Added: branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/accessdenied.jsp
===================================================================
--- branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/accessdenied.jsp (rev 0)
+++ branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/accessdenied.jsp 2008-09-18 04:12:53 UTC (rev 11927)
@@ -0,0 +1,47 @@
+<%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %>
+<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
+<%@ page isELIgnored="false" %>
+
+<portlet:defineObjects/>
+<%
+ String OP = (String)request.getAttribute("returnOp");
+ String sBackPath = null;
+ if(OP != null)
+ {
+ sBackPath = (String)request.getAttribute("path");
+ }
+ else
+ {
+ OP = CMSAdminConstants.OP_MAIN;
+ sBackPath = "/";
+ }
+%>
+<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/>
+<div class="admin-ui">
+ <br/>
+ <h3 class="sectionTitle-blue">${n:i18n("TITLE_SECURECONFIRM")}</h3>
+ <div class=" cms-tab-container">
+ <table width="100%">
+
+ <tr>
+ <td class="portlet-section-body" align="center">
+ <h2>${n:i18n("CMS_ACCESS_DENIED")}</h2>
+ </td>
+ </tr>
+ <%if(sBackPath != null){%>
+ <tr>
+ <td class="portlet-section-body" align="center">
+ <form name="accessdeniedform" method="post">
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_BACKTOBROWSER")}"
+ name="back"
+ onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sBackPath %>"/></portlet:renderURL>'"/>
+ </form>
+ </td>
+ </tr>
+ <%}%>
+ </table>
+ <br/><br/>
+ </div>
+</div>
\ No newline at end of file
17 years, 7 months
- 1
- 0