JBoss Portal SVN: r11946 - branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin.
by portal-commits＠lists.jboss.org
Author: mputz
Date: 2008-09-22 06:55:17 -0400 (Mon, 22 Sep 2008)
New Revision: 11946
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp
Log:
Fixed different button layout in file copy dialog
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp 2008-09-22 10:50:45 UTC (rev 11945)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp 2008-09-22 10:55:17 UTC (rev 11946)
@@ -38,7 +38,7 @@
</tr>
<tr>
<td></td>
- <td valign="top"><input class="portlet-form-input-field" type="submit"
+ <td valign="top"><input class="portlet-form-button" type="submit"
value="${n:i18n("CMS_COPY")}"
name="submit">
<input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}"
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11945 - branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin.
by portal-commits＠lists.jboss.org
Author: mputz
Date: 2008-09-22 06:50:45 -0400 (Mon, 22 Sep 2008)
New Revision: 11945
Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp
Log:
Fixed different button layout in file copy dialog
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp 2008-09-22 01:23:18 UTC (rev 11944)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp 2008-09-22 10:50:45 UTC (rev 11945)
@@ -38,7 +38,7 @@
</tr>
<tr>
<td></td>
- <td valign="top"><input class="portlet-form-input-field" type="submit"
+ <td valign="top"><input class="portlet-form-button" type="submit"
value="${n:i18n("CMS_COPY")}"
name="submit">
<input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}"
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11944 - in branches/JBoss_Portal_Branch_2_7: core/src/bin/portal-core-war/themes/renewal and 4 other directories.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-09-21 21:23:18 -0400 (Sun, 21 Sep 2008)
New Revision: 11944
Modified:
branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
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/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageErrorHandling.xhtml
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/style.css
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css
Log:
https://jira.jboss.org/jira/browse/JBPORTAL-2108, some cleanup, and upgrade to jsf 1.2_09
Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-09-21 02:00:18 UTC (rev 11943)
+++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-09-22 01:23:18 UTC (rev 11944)
@@ -107,7 +107,7 @@
<componentref name="sun-jaf" version="1.1"/>
<componentref name="sun-javacc" version="3.2-portal"/>
<componentref name="sun-javamail" version="1.3.1"/>
- <componentref name="sun-jsf" version="1.2_08-brew"/>
+ <componentref name="sun-jsf" version="1.2_09"/>
<componentref name="sun-opends" version="snapshot"/>
<componentref name="sun-servlet" version="2.4"/>
<componentref name="sun-jaxb" version="2.1.4"/>
Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2008-09-21 02:00:18 UTC (rev 11943)
+++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2008-09-22 01:23:18 UTC (rev 11944)
@@ -85,7 +85,7 @@
/*position: relative;*/
padding: 0 0 0 0;
- margin: 0 -350px 0 -350px;
+ margin: 0 -327px 0 -327px;
min-width: 770px;
padding: 0 0 0 0;
}
@@ -239,7 +239,7 @@
ul#tabsHeader {
width: 100%;
list-style: none;
- margin: 0 0 0 20px;
+ margin: 0;
padding: 0;
position:absolute;
bottom: -5px;
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-21 02:00:18 UTC (rev 11943)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css 2008-09-22 01:23:18 UTC (rev 11944)
@@ -225,13 +225,12 @@
.sectionTitle-blue {
font-weight: bold;
color: #5e5e5e;
- font-size: 13px; /*background-color: #5986b3;*/
-/*background-color: #ebf2f5;*/
+ font-size: 13px;
background-image: url( ../img/section-header-bg.gif );
background-position: left top;
background-repeat: repeat-x;
padding: 2px 2px 2px 4px;
- margin: 0;
+ margin: 0 0 5px 0;
border: 1px solid #dbdbdb;
}
@@ -333,12 +332,9 @@
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: 20px;
white-space: nowrap;
- /*height: 22px;*/
}
.admin-ui .actionTheme {
@@ -346,8 +342,6 @@
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: 20px;
white-space: nowrap;
@@ -358,8 +352,6 @@
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: 20px;
white-space: nowrap;
@@ -370,8 +362,6 @@
background-image: url( ../img/jbp-icon-set/delete2.gif );
background-position: left;
background-repeat: no-repeat;
- /*padding-top: 2px;*/
- /*padding-bottom: 2px;*/
line-height: 18px;
padding-left: 20px;
white-space: nowrap;
@@ -382,8 +372,6 @@
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: 22px;
white-space: nowrap;
@@ -394,8 +382,6 @@
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: 22px;
white-space: nowrap;
@@ -406,8 +392,6 @@
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: 20px;
white-space: nowrap;
@@ -418,8 +402,6 @@
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: 21px;
white-space: nowrap;
@@ -430,8 +412,6 @@
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: 18px;
padding-left: 21px;
white-space: nowrap;
@@ -442,8 +422,6 @@
background-image: url( ../img/jbp-icon-set/display_names.gif );
background-position: left;
background-repeat: no-repeat;
- /*padding-top: 2px;*/
- /*padding-bottom: 2px;*/
line-height: 18px;
padding-left: 23px;
white-space: nowrap;
@@ -454,8 +432,6 @@
background-image: url( ../img/jbp-icon-set/coordination.gif );
background-position: left;
background-repeat: no-repeat;
- /*padding-top: 2px;*/
- /*padding-bottom: 2px;*/
line-height: 18px;
padding-left: 20px;
white-space: nowrap;
@@ -465,13 +441,11 @@
background-image: url( ../img/jbp-icon-set/generic_icon.gif );
background-position: left;
background-repeat: no-repeat;
- /*padding-top: 2px;*/
- /*padding-bottom: 2px;*/
height: 18px;
padding-left: 25px;
white-space: nowrap;
display:block;
- line-height:16px;
+ float:left;
}
.admin-ui .portlet-content-center {
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-09-21 02:00:18 UTC (rev 11943)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-09-22 01:23:18 UTC (rev 11944)
@@ -109,7 +109,7 @@
COMMON_PAGE_LAYOUT=Page Layout
COMMON_REGION=Region
COMMON_UNASSIGNED_WINDOW=Unassigned windows
-COMMON_PORTAL_ERROR_HANDLING=Portal Error Handling
+COMMON_PORTAL_ERROR_HANDLING=Portal & Page Error Handling
COMMON_PORTAL_CONFIGURE_ERRORS=Configure how the system handles errors on portal level
COMMON_KEY=Key
COMMON_NAME=Name
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageErrorHandling.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageErrorHandling.xhtml 2008-09-21 02:00:18 UTC (rev 11943)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageErrorHandling.xhtml 2008-09-22 01:23:18 UTC (rev 11944)
@@ -4,7 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jstl/core">
-<p class="portlet-area-header">#{bundle.COMMON_ERROR_HANDLING}</p>
+<!--<p class="portlet-area-header">#{bundle.COMMON_ERROR_HANDLING}</p>-->
<div class="portlet-area-body">
<!-- defines error handeling section -->
@@ -14,8 +14,6 @@
</tr>
<tr>
<td valign="top" class="portlet-section-body">
-
-
<h:form>
<table class="datatable full-width">
<thead class="portlet-section-header">
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-21 02:00:18 UTC (rev 11943)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/style.css 2008-09-22 01:23:18 UTC (rev 11944)
@@ -136,69 +136,70 @@
}
.wsrp-consumers-ui .actionConfigure {
+ padding: 5px;
background-image: url( img/jbp-icon-set/settings.gif );
background-position: left;
background-repeat: no-repeat;
- line-height: 15px;
+ line-height: 18px;
padding-left: 20px;
white-space: nowrap;
}
.wsrp-consumers-ui .actionRefresh {
+ padding: 5px;
background-image: url( img/jbp-icon-set/refresh.gif );
background-position: left;
background-repeat: no-repeat;
- line-height: 15px;
+ line-height: 18px;
padding-left: 20px;
white-space: nowrap;
}
.wsrp-consumers-ui .actionRegister {
+ padding: 5px;
background-image: url( img/jbp-icon-set/register.gif );
background-position: left;
background-repeat: no-repeat;
- line-height: 17px;
+ line-height: 18px;
padding-left: 24px;
white-space: nowrap;
}
.wsrp-consumers-ui .actionDeregister {
+ padding: 5px;
background-image: url( img/jbp-icon-set/deregister.gif );
background-position: left;
background-repeat: no-repeat;
- line-height: 17px;
+ line-height: 18px;
padding-left: 24px;
white-space: nowrap;
}
.wsrp-consumers-ui .actionDelete {
+ padding: 5px;
background-image: url( img/jbp-icon-set/delete2.gif );
background-position: left;
background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 15px;
+ line-height: 18px;
padding-left: 20px;
white-space: nowrap;
}
.wsrp-consumers-ui .actionActivate {
+ padding: 5px;
background-image: url( img/jbp-icon-set/activate.gif );
background-position: left;
background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 17px;
+ line-height: 18px;
padding-left: 23px;
white-space: nowrap;
}
.wsrp-consumers-ui .actionDeactivate {
+ padding: 5px;
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: 20px;
white-space: nowrap;
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11943 - branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-09-20 22:00:18 -0400 (Sat, 20 Sep 2008)
New Revision: 11943
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css
Log:
fix typo
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-21 01:59:04 UTC (rev 11942)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css 2008-09-21 02:00:18 UTC (rev 11943)
@@ -462,7 +462,6 @@
}
.admin-ui .actionSelectPortal {
- padding: 5px;
background-image: url( ../img/jbp-icon-set/generic_icon.gif );
background-position: left;
background-repeat: no-repeat;
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11942 - 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-20 21:59:04 -0400 (Sat, 20 Sep 2008)
New Revision: 11942
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/objectNavigation.xhtml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectTemplate.xhtml
Log:
fix icon alignment in safari and make column layout fluid
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 20:58:41 UTC (rev 11941)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css 2008-09-21 01:59:04 UTC (rev 11942)
@@ -299,162 +299,180 @@
}
.admin-ui .actionDetails {
+ padding: 5px;
background-image: url( ../img/jbp-icon-set/settings.gif );
background-position: left;
background-repeat: no-repeat;
- line-height: 15px;
+ line-height: 18px;
padding-left: 18px;
white-space: nowrap;
}
.admin-ui .actionLayout {
+ padding: 5px;
background-image: url( ../img/jbp-icon-set/layout.gif );
background-position: left;
background-repeat: no-repeat;
- line-height: 15px;
+ line-height: 18px;
padding-left: 20px;
white-space: nowrap;
}
.admin-ui .actionSecurity {
+ padding: 5px;
background-image: url( ../img/jbp-icon-set/security.gif );
background-position: left;
background-repeat: no-repeat;
- line-height: 14px;
+ line-height: 18px;
padding-left: 20px;
white-space: nowrap;
}
.admin-ui .actionProperties {
+ padding: 5px;
background-image: url( ../img/jbp-icon-set/settings.gif );
background-position: left;
background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
+ /*padding-top: 2px;*/
+ /*padding-bottom: 2px;*/
+ line-height: 18px;
padding-left: 20px;
white-space: nowrap;
- height: 22px;
+ /*height: 22px;*/
}
.admin-ui .actionTheme {
+ padding: 5px;
background-image: url( ../img/jbp-icon-set/theme.gif );
background-position: left;
background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
+ /*padding-top: 2px;*/
+ /*padding-bottom: 2px;*/
line-height: 18px;
padding-left: 20px;
white-space: nowrap;
}
.admin-ui .actionRename {
+ padding: 5px;
background-image: url( ../img/jbp-icon-set/rename.gif );
background-position: left;
background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 15px;
+ /*padding-top: 2px;*/
+ /*padding-bottom: 2px;*/
+ line-height: 18px;
padding-left: 20px;
white-space: nowrap;
}
.admin-ui .actionDelete {
+ padding: 5px;
background-image: url( ../img/jbp-icon-set/delete2.gif );
background-position: left;
background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 15px;
+ /*padding-top: 2px;*/
+ /*padding-bottom: 2px;*/
+ line-height: 18px;
padding-left: 20px;
white-space: nowrap;
}
.admin-ui .actionMakeDefault {
+ padding: 5px;
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: 17px;
+ /*padding-top: 2px;*/
+ /*padding-bottom: 2px;*/
+ line-height: 18px;
padding-left: 22px;
white-space: nowrap;
}
.admin-ui .actionDefault {
+ padding: 5px;
background-image: url( ../img/jbp-icon-set/default.gif );
background-position: left;
background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 17px;
+ /*padding-top: 2px;*/
+ /*padding-bottom: 2px;*/
+ line-height: 18px;
padding-left: 22px;
white-space: nowrap;
}
.admin-ui .actionPreferences {
+ padding: 5px;
background-image: url( ../img/jbp-icon-set/settings.gif );
background-position: left;
background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 15px;
+ /*padding-top: 2px;*/
+ /*padding-bottom: 2px;*/
+ line-height: 18px;
padding-left: 20px;
white-space: nowrap;
}
.admin-ui .actionCreateInstance {
+ padding: 5px;
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: 16px;
+ /*padding-top: 2px;*/
+ /*padding-bottom: 2px;*/
+ line-height: 18px;
padding-left: 21px;
white-space: nowrap;
}
.admin-ui .actionDeleteInstance {
+ padding: 5px;
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-top: 2px;*/
+ /*padding-bottom: 2px;*/
+ line-height: 18px;
padding-left: 21px;
white-space: nowrap;
}
.admin-ui .actionDisplayNames {
+ padding: 5px;
background-image: url( ../img/jbp-icon-set/display_names.gif );
background-position: left;
background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 16px;
+ /*padding-top: 2px;*/
+ /*padding-bottom: 2px;*/
+ line-height: 18px;
padding-left: 23px;
white-space: nowrap;
}
.admin-ui .actionCoordination {
+ padding: 5px;
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-top: 2px;*/
+ /*padding-bottom: 2px;*/
+ line-height: 18px;
padding-left: 20px;
white-space: nowrap;
}
.admin-ui .actionSelectPortal {
+ padding: 5px;
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-top: 2px;*/
+ /*padding-bottom: 2px;*/
+ height: 18px;
padding-left: 25px;
white-space: nowrap;
+ display:block;
+ line-height:16px;
}
.admin-ui .portlet-content-center {
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-19 20:58:41 UTC (rev 11941)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-09-21 01:59:04 UTC (rev 11942)
@@ -83,50 +83,54 @@
<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">
+ styleClass="actionLayout float-left">
<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 float-left"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>#{bundle.SECURITY}
- </h:commandLink> <h:commandLink action="editProperties" styleClass="actionProperties"
+ </h:commandLink>
+ <h:commandLink action="editProperties" styleClass="actionProperties float-left"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>#{bundle.COMMON_PROPERTIES}
- </h:commandLink> <h:commandLink action="editPageTheme" styleClass="actionTheme"
+ </h:commandLink>
+ <h:commandLink action="editPageTheme" styleClass="actionTheme float-left"
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 float-left"
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 float-left"
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 float-left"
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"
+ <h:commandLink rendered="#{not object.default}" action="confirm" styleClass="actionDelete float-left"
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"
- action="#{portalobjectmgr.makeObjectDefault}">
+ <h:commandLink styleClass="actionMakeDefault float-left" 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:panelGrid>
+
+ <h:outputText styleClass="actionDefault float-left" rendered="#{object.default}"
+ value="#{bundle.DEFAULT}"/>
+
</h:column>
</h:dataTable>
</c:if>
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 20:58:41 UTC (rev 11941)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectTemplate.xhtml 2008-09-21 01:59:04 UTC (rev 11942)
@@ -32,7 +32,7 @@
<c:if test="#{node.type != PortalObject.TYPE_CONTEXT}">
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
</c:if>
- <li class="#{node.id == portalobjectmgr.selectedObject.id ? 'selected' : 'pathItem'}">
+ <li class="#{node.id == portalobjectmgr.selectedObject.id ? 'selected' : 'pathItem'}" style="#{node.typeName == 'portal' ? 'padding-top:3px' : ''}">
<c:choose>
<c:when test="#{fn:startsWith(node.declaredProperties['portal.windowContentType'], 'widget/')}">
<!-- If window is of contentType widget -->
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11941 - in branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal: wsrp/consumer and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-09-19 16:58:41 -0400 (Fri, 19 Sep 2008)
New Revision: 11941
Modified:
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/RegistrationInfoTestCase.java
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/RegistrationPropertyTestCase.java
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationProperty.java
Log:
- JBPORTAL-2083: started adding support for property value change listening.
- Added more tests.
- More generification.
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/RegistrationInfoTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/RegistrationInfoTestCase.java 2008-09-19 19:36:43 UTC (rev 11940)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/RegistrationInfoTestCase.java 2008-09-19 20:58:41 UTC (rev 11941)
@@ -106,9 +106,11 @@
assertFalse(names.isEmpty());
assertTrue(properties.containsKey(key));
assertTrue(names.contains(key));
- assertNotNull(properties.get(key));
- assertEquals(properties.get(key), info.getRegistrationProperty(key));
- assertEquals("bar", info.getRegistrationProperty(key).getValue());
+ Object prop = properties.get(key);
+ assertNotNull(prop);
+ RegistrationProperty registrationProperty = info.getRegistrationProperty(key);
+ assertEquals(prop, registrationProperty);
+ assertEquals("bar", registrationProperty.getValue());
}
public void testRegistrationPropertiesAndRefresh()
@@ -314,16 +316,6 @@
assertEquals("value1", properties[0].getStringValue());
}
- private void checkRegistrationData(RegistrationData registrationData, String prop0Value)
- {
- assertNotNull(registrationData);
- Property[] properties = registrationData.getRegistrationProperties();
- assertNotNull(properties);
- assertEquals(1, properties.length);
- assertEquals("prop0", properties[0].getName());
- assertEquals(prop0Value, properties[0].getStringValue());
- }
-
public void testGetRegistrationDataWithInitialWrongValue()
{
info.setRegistrationPropertyValue("prop0", "incorrect");
@@ -360,6 +352,32 @@
assertNull(info.getRegistrationProperty("prop0"));
}
+ public void testRefreshRegisteredWithoutPropsAndProducerNowSendsProps()
+ {
+ // simulate successful registration
+ info.setRegistrationContext(WSRPTypeFactory.createRegistrationContext("handle"));
+ assertTrue(info.isRegistrationRequired());
+ assertTrue(info.isRegistrationValid());
+
+ // producer now requires a registration property
+ info.refresh(createServiceDescription(true, 1), producerId, true, true, true);
+ assertTrue(info.isRegistrationRequired());
+ assertTrue(info.isRegistrationDeterminedRequired());
+ assertFalse(info.isRegistrationValid());
+ assertFalse(info.isConsistentWithProducerExpectations());
+ assertFalse(info.isModified());
+ }
+
+ private void checkRegistrationData(RegistrationData registrationData, String prop0Value)
+ {
+ assertNotNull(registrationData);
+ Property[] properties = registrationData.getRegistrationProperties();
+ assertNotNull(properties);
+ assertEquals(1, properties.length);
+ assertEquals("prop0", properties[0].getName());
+ assertEquals(prop0Value, properties[0].getStringValue());
+ }
+
private ServiceDescription createServiceDescription(boolean requiresRegistration, int numberOfProperties)
{
return ServiceDescriptionBehavior.createServiceDescription(requiresRegistration, numberOfProperties);
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/RegistrationPropertyTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/RegistrationPropertyTestCase.java 2008-09-19 19:36:43 UTC (rev 11940)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/RegistrationPropertyTestCase.java 2008-09-19 20:58:41 UTC (rev 11941)
@@ -35,9 +35,24 @@
{
private RegistrationProperty prop;
+ private Listener listener = new Listener();
+
+ private static final String VALUE = "value";
+ private static final String NEW_VALUE = "newValue";
+
+ private class Listener implements RegistrationProperty.PropertyChangeListener
+ {
+ boolean called;
+
+ public void propertyValueChanged(RegistrationProperty property, Object oldValue, Object newValue)
+ {
+ called = (prop == property) && VALUE.equals(oldValue) && NEW_VALUE.equals(newValue);
+ }
+ }
+
protected void setUp() throws Exception
{
- prop = new RegistrationProperty("name", "value", "en");
+ prop = new RegistrationProperty("name", VALUE, "en", listener);
}
public void testGetters()
@@ -56,13 +71,13 @@
prop.setInvalid(Boolean.FALSE, RegistrationProperty.Status.VALID);
// we haven't changed the value, so the status shouldn't have changed
- prop.setValue("value");
+ prop.setValue(VALUE);
assertEquals(Boolean.FALSE, prop.isInvalid());
assertEquals(RegistrationProperty.Status.VALID, prop.getStatus());
// we changed the value, status is now unknown
- prop.setValue("value2");
- assertEquals("value2", prop.getValue());
+ prop.setValue(NEW_VALUE);
+ assertEquals(NEW_VALUE, prop.getValue());
assertNull(prop.isInvalid());
assertEquals(RegistrationProperty.Status.UNCHECKED_VALUE, prop.getStatus());
}
@@ -102,4 +117,13 @@
// expected
}
}
+
+ public void testPropertyChangedEvent()
+ {
+ prop.setValue(VALUE);
+ assertFalse(listener.called);
+
+ prop.setValue(NEW_VALUE);
+ assertTrue(listener.called);
+ }
}
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java 2008-09-19 19:36:43 UTC (rev 11940)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationInfo.java 2008-09-19 20:58:41 UTC (rev 11941)
@@ -51,7 +51,7 @@
* @version $Revision$
* @since 2.6
*/
-public class RegistrationInfo
+public class RegistrationInfo implements RegistrationProperty.PropertyChangeListener
{
private static final Logger log = Logger.getLogger(RegistrationInfo.class);
@@ -64,7 +64,7 @@
private transient Boolean requiresRegistration;
private transient Boolean consistentWithProducerExpectations;
private transient RegistrationData registrationData;
- private transient boolean dirty;
+ private transient boolean modified;
private transient ProducerInfo parent;
public RegistrationInfo(ProducerInfo producerInfo)
@@ -105,7 +105,7 @@
for (RegistrationProperty otherProp : other.persistentRegistrationProperties.values())
{
String name = otherProp.getName();
- RegistrationProperty prop = new RegistrationProperty(name, otherProp.getValue(), otherProp.getLang());
+ RegistrationProperty prop = new RegistrationProperty(name, otherProp.getValue(), otherProp.getLang(), this);
prop.setStatus(otherProp.getStatus());
this.persistentRegistrationProperties.put(name, prop);
}
@@ -129,7 +129,7 @@
public void setRegistrationHandle(String registrationHandle)
{
- this.persistentRegistrationHandle = modifyIfNeeded(this.persistentRegistrationHandle, registrationHandle);
+ this.persistentRegistrationHandle = registrationHandle;
}
public byte[] getRegistrationState()
@@ -287,15 +287,13 @@
RegistrationProperty prop = getOrCreateRegistrationPropertiesMap(true).get(name);
if (prop != null)
{
- value = modifyIfNeeded(prop.getValue(), value);
prop.setValue(value);
}
else
{
// todo: deal with language more appropriately
- prop = new RegistrationProperty(name, value, WSRPUtils.toString(Locale.getDefault()));
+ prop = new RegistrationProperty(name, value, WSRPUtils.toString(Locale.getDefault()), this);
getOrCreateRegistrationPropertiesMap(false).put(name, prop);
- dirty = true;
}
return prop;
@@ -304,12 +302,12 @@
public void removeRegistrationProperty(String name)
{
ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(name, "registration property name", "RegistrationInfo.removeRegistrationProperty");
- Map propertiesMap = getOrCreateRegistrationPropertiesMap(false);
+ Map<String, RegistrationProperty> propertiesMap = getOrCreateRegistrationPropertiesMap(false);
if (propertiesMap == null || propertiesMap.remove(name) == null)
{
throw new IllegalArgumentException("Cannot remove inexistent registration property '" + name + "'");
}
- dirty = true;
+ setModified(true);
}
private Map<String, RegistrationProperty> getOrCreateRegistrationPropertiesMap(boolean forceCreate)
@@ -404,7 +402,7 @@
{
result.setRegistrationProperties(new HashMap<String, RegistrationProperty>(persistentRegistrationProperties));
}
- dirty = false;
+ setModified(false);
if (serviceDescription.isRequiresRegistration())
{
@@ -508,7 +506,7 @@
if (forceCheckOfExtraProps || !hasRegisteredIfNeeded())
{
log.debug("Registration data is available when none is expected by the producer");
- checkForExtraProperties(producerId, result, Collections.EMPTY_SET, properties, keepExtra);
+ checkForExtraProperties(producerId, result, Collections.<String>emptySet(), properties, keepExtra);
}
else
{
@@ -581,7 +579,7 @@
{
String name = description.getName();
RegistrationPropertyDescription desc = WSRPUtils.convertToRegistrationPropertyDescription(description);
- RegistrationProperty prop = new RegistrationProperty(name, null, WSRPUtils.toString(desc.getLang()));
+ RegistrationProperty prop = new RegistrationProperty(name, null, WSRPUtils.toString(desc.getLang()), this);
prop.setDescription(desc);
prop.setInvalid(Boolean.TRUE, RegistrationProperty.Status.MISSING_VALUE);
result.put(name, prop);
@@ -629,7 +627,7 @@
consistentWithProducerExpectations = Boolean.TRUE; // since we have a registration context, we're consistent with the Producer
requiresRegistration = Boolean.TRUE; // we know we require registration
- dirty = false; // our state is clean :)
+ setModified(false); // our state is clean :)
}
public RegistrationContext getRegistrationContext()
@@ -648,14 +646,20 @@
public boolean isModified()
{
- return dirty;
+ return modified;
}
public void setModified(boolean modified)
{
- this.dirty = modified;
+ this.modified = modified;
}
+ /** todo: Should be package-only, public for tests... */
+ public void propertyValueChanged(RegistrationProperty property, Object oldValue, Object newValue)
+ {
+ setModified(true);
+ }
+
public class RegistrationRefreshResult extends RefreshResult
{
private Map<String, RegistrationProperty> registrationProperties;
@@ -675,16 +679,4 @@
this.registrationProperties = registrationProperties;
}
}
-
- private String modifyIfNeeded(String oldValue, String newValue)
- {
- if ((oldValue != null && !oldValue.equals(newValue)) || (oldValue == null && newValue != null))
- {
- oldValue = newValue;
- dirty = true;
- consistentWithProducerExpectations = null;
- }
-
- return oldValue;
- }
}
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationProperty.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationProperty.java 2008-09-19 19:36:43 UTC (rev 11940)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/RegistrationProperty.java 2008-09-19 20:58:41 UTC (rev 11941)
@@ -41,13 +41,7 @@
private String persistentName;
private String persistentValue;
- /*private transient String status;
- public static final String INEXISTENT_STATUS = "Inexistent on Producer";
- public static final String MISSING_STATUS = "Missing";
- public static final String MISSING_VALUE_STATUS = "Missing value";
- public static final String UNCHECKED_VALUE_STATUS = "Undetermined status";
- public static final String INVALID_VALUE_STATUS = "Invalid value";*/
-
+ private transient PropertyChangeListener listener;
private transient Status status;
public enum Status
@@ -76,12 +70,14 @@
{
}
- public RegistrationProperty(String name, String stringValue, String lang)
+ public RegistrationProperty(String name, String stringValue, String lang, PropertyChangeListener listener)
{
ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(name, "Name", "RegistrationProperty");
ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(lang, "Lang", "RegistrationProperty");
+ ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(lang, "listener", "RegistrationProperty");
this.persistentName = name;
this.persistentLang = lang;
+ this.listener = listener;
setValue(stringValue);
}
@@ -192,8 +188,10 @@
public void setValue(String stringValue)
{
+ // only change the value if it's not the same as the old one
if ((persistentValue != null && !persistentValue.equals(stringValue)) || (persistentValue == null && stringValue != null))
{
+ String oldValue = persistentValue;
persistentValue = stringValue;
persistentInvalid = null;
if (persistentValue == null)
@@ -204,6 +202,9 @@
{
status = UNCHECKED_VALUE;
}
+
+ // notify listeners
+ notifyListener(oldValue, persistentValue);
}
}
@@ -227,4 +228,18 @@
{
this.status = status;
}
+
+ private void notifyListener(String oldValue, String newValue)
+ {
+ if (listener != null)
+ {
+ listener.propertyValueChanged(this, oldValue, newValue);
+ }
+ }
+
+ /** todo: Should be package-only, public for tests... */
+ public static interface PropertyChangeListener
+ {
+ void propertyValueChanged(RegistrationProperty property, Object oldValue, Object newValue);
+ }
}
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11940 - in branches/JBoss_Portal_Branch_2_7: core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers and 2 other directories.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-09-19 15:36:43 -0400 (Fri, 19 Sep 2008)
New Revision: 11940
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-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/confirmDeleteConsumer.xhtml
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/confirmEraseRegistration.xhtml
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumerTemplate.xhtml
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumers.xhtml
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/management/managementTemplate.xhtml
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/confirmPropDeletion.xhtml
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producer.xhtml
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producerTemplate.xhtml
Log:
[JBPORTAL-2101] adding ids to identity admin ui
[JBPORTAL-2103] adding ids to wsrp admin ui
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-19 18:15:48 UTC (rev 11939)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/deleteUser.xhtml 2008-09-19 19:36:43 UTC (rev 11940)
@@ -34,7 +34,7 @@
#{bundle.IDENTITY_WARNING_CONFIRM_DELETE_USER}
'#{useradministrationbean.uiUser.username}'
</p>
- <h:form>
+ <h:form id="delete-user-form">
<h:commandButton id="cancel" value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="searchUsers"
styleClass="portlet-form-button portlet-section-buttonrow" />
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/confirmDeleteConsumer.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/confirmDeleteConsumer.xhtml 2008-09-19 18:15:48 UTC (rev 11939)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/confirmDeleteConsumer.xhtml 2008-09-19 19:36:43 UTC (rev 11940)
@@ -25,12 +25,12 @@
<p class="portlet-class">#{i18n.confirm_detete_consumer_proceed}</p>
- <h:form>
- <h:commandLink value="#{i18n.confirm_delete_consumer_submit}" action="#{consumersMgr.destroyConsumer}"
+ <h:form id="confirm-delete-form">
+ <h:commandLink id="destroy-link" value="#{i18n.confirm_delete_consumer_submit}" action="#{consumersMgr.destroyConsumer}"
styleClass="portlet-form-button portlet-section-buttonrow">
<f:param name="id" value="#{consumersMgr.selectedConsumer.producerId}"/>
</h:commandLink>
- <h:commandButton value="#{i18n.confirm_delete_consumer_cancel}" action="#{consumersMgr.listConsumers}"
+ <h:commandButton id="cancel-link" value="#{i18n.confirm_delete_consumer_cancel}" action="#{consumersMgr.listConsumers}"
styleClass="portlet-form-button portlet-section-buttonrow"/>
</h:form>
</div>
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/confirmEraseRegistration.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/confirmEraseRegistration.xhtml 2008-09-19 18:15:48 UTC (rev 11939)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/confirmEraseRegistration.xhtml 2008-09-19 19:36:43 UTC (rev 11940)
@@ -25,11 +25,11 @@
<p class="portlet-class">#{i18n.confirm_delete_registration_proceed}</p>
- <h:form>
- <h:commandButton value="#{i18n.confirm_delete_registration_submit}"
+ <h:form id="confirm-erase-form">
+ <h:commandButton id="submit" value="#{i18n.confirm_delete_registration_submit}"
action="#{consumer.eraseLocalRegistration}"
styleClass="portlet-form-button portlet-section-buttonrow"/>
- <h:commandButton value="#{i18n.confirm_delete_registration_cancel}" action="configureConsumer"
+ <h:commandButton id="cancel" value="#{i18n.confirm_delete_registration_cancel}" action="configureConsumer"
styleClass="portlet-form-button portlet-section-buttonrow"/>
</h:form>
</div>
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumerTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumerTemplate.xhtml 2008-09-19 18:15:48 UTC (rev 11939)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumerTemplate.xhtml 2008-09-19 19:36:43 UTC (rev 11940)
@@ -5,22 +5,22 @@
xmlns:c="http://java.sun.com/jstl/core">
<ui:define name="topnav">
- <h:form>
+ <h:form id="cons-temp-form">
<ul class="topnav">
<li id="currentTab">#{i18n.nav_tabs_consumers}</li>
- <li><h:commandLink id="producerTab" value="#{i18n.nav_tabs_producer_config}" action="producer"/></li>
+ <li><h:commandLink id="producer-link" value="#{i18n.nav_tabs_producer_config}" action="producer"/></li>
<ui:remove>
- <li><h:commandLink value="#{i18n.nav_tabs_producer_management}" action="management"/></li>
+ <li><h:commandLink id="management-link" value="#{i18n.nav_tabs_producer_management}" action="management"/></li>
</ui:remove>
</ul>
</h:form>
</ui:define>
<ui:define name="objectpath">
- <h:form>
+ <h:form id="cons-temp-form1">
<ul class="objectpath">
<li class="#{!empty title ? 'selected' : 'pathItem'}">
- <h:commandLink action="#{consumersMgr.listConsumers}" value="#{i18n.path_consumers_root}"/>
+ <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}" value="#{i18n.path_consumers_root}"/>
</li>
<c:if test="#{empty title}">
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumers.xhtml 2008-09-19 18:15:48 UTC (rev 11939)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumers.xhtml 2008-09-19 19:36:43 UTC (rev 11940)
@@ -19,7 +19,7 @@
</h:form>
<!-- Consumers list -->
- <h:form>
+ <h:form id="consumer-list-form">
<h:dataTable id="consumersList" value="#{consumersMgr.consumers}" var="cons" rendered="#{!empty consumersMgr.consumers}"
rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header"
styleClass="datatable objectList" width="100%">
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml 2008-09-19 18:15:48 UTC (rev 11939)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml 2008-09-19 19:36:43 UTC (rev 11940)
@@ -9,7 +9,7 @@
<hr/>
-<h:form>
+<h:form id="edit-cons-form">
<table width="100%" class="portlet-table-body #{consumer.active ? 'active' : 'inactive'}">
<tr>
<th>#{i18n.edit_consumer_producer}</th>
@@ -105,7 +105,7 @@
</tr>
</c:forEach>
</table>
- <h:commandLink action="#{consumer.update}"
+ <h:commandLink id="cons-update-link" action="#{consumer.update}"
value="#{i18n.edit_consumer_registration_update_props}"
rendered="#{consumer.registered}"
styleClass="portlet-form-button portlet-section-buttonrow"/>
@@ -114,7 +114,7 @@
#{i18n.edit_consumer_registration_no_props}
</c:otherwise>
</c:choose>
- <h:commandLink action="#{consumer.modifyRegistration}"
+ <h:commandLink id="modify-reg-link" action="#{consumer.modifyRegistration}"
value="#{i18n.edit_consumer_registration_modify}"
rendered="#{consumer.registrationLocallyModified}"
title="#{i18n.edit_consumer_registration_modify_title}"
@@ -154,7 +154,7 @@
#{i18n.edit_consumer_registration_no_props}
</c:otherwise>
</c:choose>
- <h:commandLink action="#{consumer.modifyRegistration}"
+ <h:commandLink id="edit-reg-link" action="#{consumer.modifyRegistration}"
value="#{i18n.edit_consumer_registration_modify}"
title="#{i18n.edit_consumer_registration_modify_title}"
styleClass="portlet-form-button portlet-section-buttonrow"/>
@@ -174,7 +174,7 @@
<td id="handle">
#{i18n.edit_consumer_registration_context_handle} <h:outputText
value="#{consumer.producerInfo.registrationInfo.registrationHandle}"/>
- <h:commandLink action="confirmEraseRegistration" value="#{i18n.edit_consumer_registration_context_erase}"
+ <h:commandLink id="erase-cons-link" action="confirmEraseRegistration" value="#{i18n.edit_consumer_registration_context_erase}"
title="#{i18n.edit_consumer_registration_context_erase_title}"
styleClass="portlet-form-button"/>
</td>
@@ -184,10 +184,10 @@
<tr>
<th/>
<td class="portlet-section-buttonrow">
- <h:commandButton action="#{consumer.refreshConsumer}" value="#{i18n.edit_consumer_refresh}"
+ <h:commandButton id="refresh-cons-link" action="#{consumer.refreshConsumer}" value="#{i18n.edit_consumer_refresh}"
title="#{i18n.edit_consumer_refresh_title}"
styleClass="portlet-form-button"/>
- <h:commandLink action="#{consumersMgr.listConsumers}" value="#{i18n.edit_consumer_cancel}" immediate="true"
+ <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}" value="#{i18n.edit_consumer_cancel}" immediate="true"
styleClass="portlet-form-button"/>
</td>
</tr>
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/management/managementTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/management/managementTemplate.xhtml 2008-09-19 18:15:48 UTC (rev 11939)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/management/managementTemplate.xhtml 2008-09-19 19:36:43 UTC (rev 11940)
@@ -5,10 +5,10 @@
xmlns:c="http://java.sun.com/jstl/core">
<ui:define name="topnav">
- <h:form>
+ <h:form id="management-temp-link">
<ul class="topnav">
- <li><h:commandLink action="consumers" value="#{i18n.nav_tabs_consumers}"/></li>
- <li><h:commandLink action="producer" value="#{i18n.nav_tabs_producer_config}"/></li>
+ <li><h:commandLink id="consumers" action="consumers" value="#{i18n.nav_tabs_consumers}"/></li>
+ <li><h:commandLink id="producer" action="producer" value="#{i18n.nav_tabs_producer_config}"/></li>
<li id="currentTab">#{i18n.nav_tabs_producer_management}</li>
</ul>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/confirmPropDeletion.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/confirmPropDeletion.xhtml 2008-09-19 18:15:48 UTC (rev 11939)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/confirmPropDeletion.xhtml 2008-09-19 19:36:43 UTC (rev 11940)
@@ -25,10 +25,11 @@
<p class="portlet-class">#{i18n.confirm_delete_reg_property_proceed}</p>
- <h:form>
- <h:commandButton value="#{i18n.confirm_delete_reg_property_submit}" action="#{producer.deleteRegistrationProperty}"
+ <h:form id="confirm-prop-del-form">
+ <h:commandButton id="confirm-delete" value="#{i18n.confirm_delete_reg_property_submit}"
+ action="#{producer.deleteRegistrationProperty}"
styleClass="portlet-form-button portlet-section-buttonrow"/>
- <h:commandButton value="#{i18n.confirm_delete_reg_property_cancel}" action="producer"
+ <h:commandButton id="cancel-delete" value="#{i18n.confirm_delete_reg_property_cancel}" action="producer"
styleClass="portlet-form-button portlet-section-buttonrow"/>
</h:form>
</div>
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producer.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producer.xhtml 2008-09-19 18:15:48 UTC (rev 11939)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producer.xhtml 2008-09-19 19:36:43 UTC (rev 11940)
@@ -7,7 +7,7 @@
<ui:param name="title" value="#{i18n.producer_config_title}"/>
<ui:define name="content">
- <h:form>
+ <h:form id="producer-form">
<h:panelGrid columns="2" width="100%">
<h:selectBooleanCheckbox value="#{producer.registrationRequiredForFullDescription}"/>
<h:outputText value="#{i18n.producer_config_sd_requires_reg}"/>
@@ -40,7 +40,7 @@
<h:panelGroup styleClass="portlet-area-body">
<c:choose>
<c:when test="#{!empty producer.registrationProperties}">
- <h:dataTable var="property" id="registrationProperties" width="100%"
+ <h:dataTable id="producer-data-table" var="property" id="registrationProperties" width="100%"
value="#{producer.registrationProperties}"
rendered="#{producer.registrationRequired}"
headerClass="portlet-section-header">
@@ -50,7 +50,7 @@
</h:column>
<h:column>
<f:facet name="header">#{i18n.producer_config_reg_prop_type}</f:facet>
- <h:selectOneListbox disabled="true">
+ <h:selectOneListbox id="producer-list" disabled="true">
<f:selectItems value="#{producer.supportedPropertyTypes}"/>
</h:selectOneListbox>
</h:column>
@@ -64,7 +64,8 @@
</h:column>
<h:column>
<f:facet name="header">#{i18n.producer_config_reg_prop_action}</f:facet>
- <h:commandLink action="confirmPropDeletion" value="#{i18n.producer_config_reg_prop_remove}"
+ <h:commandLink id="confirm-delete" action="confirmPropDeletion"
+ value="#{i18n.producer_config_reg_prop_remove}"
styleClass="portlet-form-button"
actionListener="#{producer.selectProperty}">
<f:param name="propName" value="#{property.nameAsString}"/>
@@ -76,16 +77,19 @@
<h:outputText value="#{i18n.producer_config_no_reg_props}"/>
</c:otherwise>
</c:choose>
- <h:commandLink action="#{producer.addRegistrationProperty}" value="#{i18n.producer_config_add_reg_prop}"
+
+ <h:commandLink id="add-reg-prop" action="#{producer.addRegistrationProperty}"
+ value="#{i18n.producer_config_add_reg_prop}"
styleClass="portlet-form-button"/>
</h:panelGroup>
</h:panelGroup>
<h:outputText value=" "/>
<h:panelGroup styleClass="portlet-section-buttonrow">
- <h:commandButton action="#{producer.save}" value="#{i18n.producer_config_save}" styleClass="portlet-form-button"/>
- <h:commandButton action="#{producer.reloadConfiguration}" value="#{i18n.producer_config_cancel}"
+ <h:commandButton id="save-producer" action="#{producer.save}" value="#{i18n.producer_config_save}"
styleClass="portlet-form-button"/>
+ <h:commandButton id="reload-producer" action="#{producer.reloadConfiguration}" value="#{i18n.producer_config_cancel}"
+ styleClass="portlet-form-button"/>
</h:panelGroup>
</h:panelGrid>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producerTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producerTemplate.xhtml 2008-09-19 18:15:48 UTC (rev 11939)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producerTemplate.xhtml 2008-09-19 19:36:43 UTC (rev 11940)
@@ -5,12 +5,12 @@
xmlns:c="http://java.sun.com/jstl/core">
<ui:define name="topnav">
- <h:form>
+ <h:form id="producer-temp-form">
<ul class="topnav">
<li><h:commandLink id="consumersTab" action="consumers" value="#{i18n.nav_tabs_consumers}"/></li>
<li id="currentTab">#{i18n.nav_tabs_producer_config}</li>
<ui:remove>
- <li><h:commandLink value="#{i18n.nav_tabs_producer_management}" action="management"/></li>
+ <li><h:commandLink id="prod-manag-link" value="#{i18n.nav_tabs_producer_management}" action="management"/></li>
</ui:remove>
</ul>
</h:form>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11939 - in branches/JBoss_Portal_Branch_2_6: core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers and 2 other directories.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-09-19 14:15:48 -0400 (Fri, 19 Sep 2008)
New Revision: 11939
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-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmDeleteConsumer.xhtml
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmEraseRegistration.xhtml
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/management/managementTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/confirmPropDeletion.xhtml
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producer.xhtml
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producerTemplate.xhtml
Log:
[JBPORTAL-2101] adding ids to identity admin ui
[JBPORTAL-2103] adding ids to wsrp admin ui
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-19 02:52:02 UTC (rev 11938)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml 2008-09-19 18:15:48 UTC (rev 11939)
@@ -34,7 +34,7 @@
#{bundle.IDENTITY_WARNING_CONFIRM_DELETE_USER}
#{useradministrationbean.uiUser.username}
</p>
- <h:form>
+ <h:form id="delete-user-form">
<h:commandButton id="cancel" value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="searchUsers"
styleClass="portlet-form-button portlet-section-buttonrow" />
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmDeleteConsumer.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmDeleteConsumer.xhtml 2008-09-19 02:52:02 UTC (rev 11938)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmDeleteConsumer.xhtml 2008-09-19 18:15:48 UTC (rev 11939)
@@ -25,12 +25,12 @@
<p class="portlet-class">#{i18n.confirm_detete_consumer_proceed}</p>
- <h:form>
- <h:commandLink value="#{i18n.confirm_delete_consumer_submit}" action="#{consumersMgr.destroyConsumer}"
+ <h:form id="confirm-delete-form">
+ <h:commandLink id="destroy-link" value="#{i18n.confirm_delete_consumer_submit}" action="#{consumersMgr.destroyConsumer}"
styleClass="portlet-form-button portlet-section-buttonrow">
<f:param name="id" value="#{consumersMgr.selectedConsumer.producerId}"/>
</h:commandLink>
- <h:commandButton value="#{i18n.confirm_delete_consumer_cancel}" action="#{consumersMgr.listConsumers}"
+ <h:commandButton id="cancel-link" value="#{i18n.confirm_delete_consumer_cancel}" action="#{consumersMgr.listConsumers}"
styleClass="portlet-form-button portlet-section-buttonrow"/>
</h:form>
</div>
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmEraseRegistration.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmEraseRegistration.xhtml 2008-09-19 02:52:02 UTC (rev 11938)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmEraseRegistration.xhtml 2008-09-19 18:15:48 UTC (rev 11939)
@@ -25,11 +25,11 @@
<p class="portlet-class">#{i18n.confirm_delete_registration_proceed}</p>
- <h:form>
- <h:commandButton value="#{i18n.confirm_delete_registration_submit}"
+ <h:form id="confirm-erase-form">
+ <h:commandButton id="submit" value="#{i18n.confirm_delete_registration_submit}"
action="#{consumer.eraseLocalRegistration}"
styleClass="portlet-form-button portlet-section-buttonrow"/>
- <h:commandButton value="#{i18n.confirm_delete_registration_cancel}" action="configureConsumer"
+ <h:commandButton id="cancel" value="#{i18n.confirm_delete_registration_cancel}" action="configureConsumer"
styleClass="portlet-form-button portlet-section-buttonrow"/>
</h:form>
</div>
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml 2008-09-19 02:52:02 UTC (rev 11938)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml 2008-09-19 18:15:48 UTC (rev 11939)
@@ -5,22 +5,22 @@
xmlns:c="http://java.sun.com/jstl/core">
<ui:define name="topnav">
- <h:form>
+ <h:form id="cons-temp-form">
<ul class="topnav">
<li id="currentTab">#{i18n.nav_tabs_consumers}</li>
- <li><h:commandLink id="producerTab" value="#{i18n.nav_tabs_producer_config}" action="producer"/></li>
+ <li><h:commandLink id="producer-link" value="#{i18n.nav_tabs_producer_config}" action="producer"/></li>
<ui:remove>
- <li><h:commandLink value="#{i18n.nav_tabs_producer_management}" action="management"/></li>
+ <li><h:commandLink id="management-link" value="#{i18n.nav_tabs_producer_management}" action="management"/></li>
</ui:remove>
</ul>
</h:form>
</ui:define>
<ui:define name="objectpath">
- <h:form>
+ <h:form id="cons-temp-form1">
<ul class="objectpath">
<li class="#{!empty title ? 'selected' : 'pathItem'}">
- <h:commandLink action="#{consumersMgr.listConsumers}" value="#{i18n.path_consumers_root}"/>
+ <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}" value="#{i18n.path_consumers_root}"/>
</li>
<c:if test="#{empty title}">
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml 2008-09-19 02:52:02 UTC (rev 11938)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml 2008-09-19 18:15:48 UTC (rev 11939)
@@ -19,7 +19,7 @@
</h:form>
<!-- Consumers list -->
- <h:form>
+ <h:form id="consumer-list-form">
<h:dataTable id="consumersList" value="#{consumersMgr.consumers}" var="cons" rendered="#{!empty consumersMgr.consumers}"
rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header"
styleClass="datatable objectList" width="100%">
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml 2008-09-19 02:52:02 UTC (rev 11938)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml 2008-09-19 18:15:48 UTC (rev 11939)
@@ -9,7 +9,7 @@
<hr/>
-<h:form>
+<h:form id="edit-cons-form">
<table width="100%" class="portlet-table-body #{consumer.active ? 'active' : 'inactive'}">
<tr>
<th>#{i18n.edit_consumer_producer}</th>
@@ -104,7 +104,7 @@
</tr>
</c:forEach>
</table>
- <h:commandLink action="#{consumer.update}"
+ <h:commandLink id="cons-update-link" action="#{consumer.update}"
value="#{i18n.edit_consumer_registration_update_props}"
rendered="#{consumer.registered}"
styleClass="portlet-form-button portlet-section-buttonrow"/>
@@ -113,7 +113,7 @@
#{i18n.edit_consumer_registration_no_props}
</c:otherwise>
</c:choose>
- <h:commandLink action="#{consumer.modifyRegistration}"
+ <h:commandLink id="modify-reg-link" action="#{consumer.modifyRegistration}"
value="#{i18n.edit_consumer_registration_modify}"
rendered="#{consumer.registrationLocallyModified}"
title="#{i18n.edit_consumer_registration_modify_title}"
@@ -151,7 +151,7 @@
#{i18n.edit_consumer_registration_no_props}
</c:otherwise>
</c:choose>
- <h:commandLink action="#{consumer.modifyRegistration}"
+ <h:commandLink id="edit-reg-link" action="#{consumer.modifyRegistration}"
value="#{i18n.edit_consumer_registration_modify}"
title="#{i18n.edit_consumer_registration_modify_title}"
styleClass="portlet-form-button portlet-section-buttonrow"/>
@@ -170,7 +170,7 @@
<th>#{i18n.edit_consumer_registration_context}</th>
<td id="handle">
#{i18n.edit_consumer_registration_context_handle} <h:outputText value="#{consumer.producerInfo.registrationInfo.registrationHandle}"/>
- <h:commandLink action="confirmEraseRegistration" value="#{i18n.edit_consumer_registration_context_erase}"
+ <h:commandLink id="erase-cons-link" action="confirmEraseRegistration" value="#{i18n.edit_consumer_registration_context_erase}"
title="#{i18n.edit_consumer_registration_context_erase_title}"
styleClass="portlet-form-button"/>
</td>
@@ -180,10 +180,10 @@
<tr>
<th/>
<td class="portlet-section-buttonrow">
- <h:commandButton action="#{consumer.refreshConsumer}" value="#{i18n.edit_consumer_refresh}"
+ <h:commandButton id="refresh-cons-link" action="#{consumer.refreshConsumer}" value="#{i18n.edit_consumer_refresh}"
title="#{i18n.edit_consumer_refresh_title}"
styleClass="portlet-form-button"/>
- <h:commandLink action="#{consumersMgr.listConsumers}" value="#{i18n.edit_consumer_cancel}" immediate="true"
+ <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}" value="#{i18n.edit_consumer_cancel}" immediate="true"
styleClass="portlet-form-button"/>
</td>
</tr>
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/management/managementTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/management/managementTemplate.xhtml 2008-09-19 02:52:02 UTC (rev 11938)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/management/managementTemplate.xhtml 2008-09-19 18:15:48 UTC (rev 11939)
@@ -5,10 +5,10 @@
xmlns:c="http://java.sun.com/jstl/core">
<ui:define name="topnav">
- <h:form>
+ <h:form id="management-temp-link">
<ul class="topnav">
- <li><h:commandLink action="consumers" value="#{i18n.nav_tabs_consumers}"/></li>
- <li><h:commandLink action="producer" value="#{i18n.nav_tabs_producer_config}"/></li>
+ <li><h:commandLink id="consumers" action="consumers" value="#{i18n.nav_tabs_consumers}"/></li>
+ <li><h:commandLink id="producer" action="producer" value="#{i18n.nav_tabs_producer_config}"/></li>
<li id="currentTab">#{i18n.nav_tabs_producer_management}</li>
</ul>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/confirmPropDeletion.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/confirmPropDeletion.xhtml 2008-09-19 02:52:02 UTC (rev 11938)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/confirmPropDeletion.xhtml 2008-09-19 18:15:48 UTC (rev 11939)
@@ -25,11 +25,11 @@
<p class="portlet-class">#{i18n.confirm_delete_reg_property_proceed}</p>
- <h:form>
- <h:commandButton value="#{i18n.confirm_delete_reg_property_submit}"
+ <h:form id="confirm-prop-del-form">
+ <h:commandButton id="confirm-delete" value="#{i18n.confirm_delete_reg_property_submit}"
action="#{producer.deleteRegistrationProperty}"
styleClass="portlet-form-button portlet-section-buttonrow"/>
- <h:commandButton value="#{i18n.confirm_delete_reg_property_cancel}" action="producer"
+ <h:commandButton id="cancel-delete" value="#{i18n.confirm_delete_reg_property_cancel}" action="producer"
styleClass="portlet-form-button portlet-section-buttonrow"/>
</h:form>
</div>
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producer.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producer.xhtml 2008-09-19 02:52:02 UTC (rev 11938)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producer.xhtml 2008-09-19 18:15:48 UTC (rev 11939)
@@ -7,7 +7,7 @@
<ui:param name="title" value="#{i18n.producer_config_title}"/>
<ui:define name="content">
- <h:form>
+ <h:form id="producer-form">
<h:panelGrid columns="2" width="100%">
<h:selectBooleanCheckbox value="#{producer.registrationRequiredForFullDescription}"/>
<h:outputText value="#{i18n.producer_config_sd_requires_reg}"/>
@@ -37,7 +37,7 @@
<h:panelGroup styleClass="portlet-area-body">
<c:choose>
<c:when test="#{!empty producer.registrationProperties}">
- <h:dataTable var="property" id="registrationProperties" width="100%"
+ <h:dataTable id="producer-data-table" var="property" id="registrationProperties" width="100%"
value="#{producer.registrationProperties}"
rendered="#{producer.registrationRequired}"
headerClass="portlet-section-header">
@@ -47,7 +47,7 @@
</h:column>
<h:column>
<f:facet name="header">#{i18n.producer_config_reg_prop_type}</f:facet>
- <h:selectOneListbox disabled="true">
+ <h:selectOneListbox id="producer-list" disabled="true">
<f:selectItems value="#{producer.supportedPropertyTypes}"/>
</h:selectOneListbox>
</h:column>
@@ -61,7 +61,7 @@
</h:column>
<h:column>
<f:facet name="header">#{i18n.producer_config_reg_prop_action}</f:facet>
- <h:commandLink action="confirmPropDeletion"
+ <h:commandLink id="confirm-delete" action="confirmPropDeletion"
value="#{i18n.producer_config_reg_prop_remove}"
styleClass="portlet-form-button"
actionListener="#{producer.selectProperty}">
@@ -74,7 +74,7 @@
<h:outputText value="#{i18n.producer_config_no_reg_props}"/>
</c:otherwise>
</c:choose>
- <h:commandLink action="#{producer.addRegistrationProperty}"
+ <h:commandLink id="add-reg-prop" action="#{producer.addRegistrationProperty}"
value="#{i18n.producer_config_add_reg_prop}"
styleClass="portlet-form-button"/>
</h:panelGroup>
@@ -82,9 +82,9 @@
<h:outputText value=" "/>
<h:panelGroup styleClass="portlet-section-buttonrow">
- <h:commandButton action="#{producer.save}" value="#{i18n.producer_config_save}"
+ <h:commandButton id="save-producer" action="#{producer.save}" value="#{i18n.producer_config_save}"
styleClass="portlet-form-button"/>
- <h:commandButton action="#{producer.reloadConfiguration}" value="#{i18n.producer_config_cancel}"
+ <h:commandButton id="reload-producer" action="#{producer.reloadConfiguration}" value="#{i18n.producer_config_cancel}"
styleClass="portlet-form-button"/>
</h:panelGroup>
</h:panelGrid>
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producerTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producerTemplate.xhtml 2008-09-19 02:52:02 UTC (rev 11938)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producerTemplate.xhtml 2008-09-19 18:15:48 UTC (rev 11939)
@@ -5,12 +5,12 @@
xmlns:c="http://java.sun.com/jstl/core">
<ui:define name="topnav">
- <h:form>
+ <h:form id="producer-temp-form">
<ul class="topnav">
<li><h:commandLink id="consumersTab" action="consumers" value="#{i18n.nav_tabs_consumers}"/></li>
<li id="currentTab">#{i18n.nav_tabs_producer_config}</li>
<ui:remove>
- <li><h:commandLink value="#{i18n.nav_tabs_producer_management}" action="management"/></li>
+ <li><h:commandLink id="prod-manag-link" value="#{i18n.nav_tabs_producer_management}" action="management"/></li>
</ui:remove>
</ul>
</h:form>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11938 - branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-09-18 22:52:02 -0400 (Thu, 18 Sep 2008)
New Revision: 11938
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css
Log:
nevermind, safari needs it
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 02:48:37 UTC (rev 11937)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css 2008-09-19 02:52:02 UTC (rev 11938)
@@ -451,6 +451,8 @@
background-position: left;
background-repeat: no-repeat;
padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 16px;
padding-left: 25px;
white-space: nowrap;
}
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11937 - branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-09-18 22:48:37 -0400 (Thu, 18 Sep 2008)
New Revision: 11937
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css
Log:
don't need line-height or padding here
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 02:44:57 UTC (rev 11936)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css 2008-09-19 02:48:37 UTC (rev 11937)
@@ -451,8 +451,6 @@
background-position: left;
background-repeat: no-repeat;
padding-top: 2px;
- padding-bottom: 2px;
- line-height: 16px;
padding-left: 25px;
white-space: nowrap;
}
17 years, 7 months
- 1
- 0