JBoss Portal SVN: r8479 - in branches/JBoss_Portal_Branch_2_6/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: 2007-09-24 19:34:54 -0400 (Mon, 24 Sep 2007)
New Revision: 8479
Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/InvocationHandler.java
Log:
- JBPORTAL-1717:
+ Properly update retry count if response is null and return an ErrorResponse if it reaches the max number of retries.
+ Updated test case.
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java 2007-09-24 23:19:27 UTC (rev 8478)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java 2007-09-24 23:34:54 UTC (rev 8479)
@@ -79,6 +79,11 @@
checkRenderResult(consumer.invoke(createRenderInvocation(EmptyMarkupBehavior.PORTLET_HANDLE)), "");
}
+ public void testNullAction() throws Exception
+ {
+ ExtendedAssert.assertTrue(consumer.invoke(createActionInvocation(NullMarkupBehavior.PORTLET_HANDLE)) instanceof ErrorResponse);
+ }
+
public void testNullRender() throws Exception
{
ExtendedAssert.assertTrue(consumer.invoke(createRenderInvocation(NullMarkupBehavior.PORTLET_HANDLE)) instanceof ErrorResponse);
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/InvocationHandler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/InvocationHandler.java 2007-09-24 23:19:27 UTC (rev 8478)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/InvocationHandler.java 2007-09-24 23:34:54 UTC (rev 8479)
@@ -135,10 +135,23 @@
}
finally
{
+ if (response == null)
+ {
+ retryCount++;
+ }
+
// we're done: reset currently held information
sessionHandler.resetCurrentlyHeldInformation();
}
}
+
+ if (retryCount == MAXIMUM_RETRY_NUMBER)
+ {
+ return new ErrorResponse("Tried to perform request " + MAXIMUM_RETRY_NUMBER
+ + " times before giving up. This usually happens if an error in the WS stack prevented the messages to be " +
+ "properly transmitted. Look at server.log for clues as to what happened...");
+ }
+
log.debug("performRequest finished. Response is " + (response != null ? response.getClass().getName() : null));
return response;
}
16 years, 7 months
JBoss Portal SVN: r8478 - tags/JBoss_Portal_2_6_2/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-24 19:19:27 -0400 (Mon, 24 Sep 2007)
New Revision: 8478
Modified:
tags/JBoss_Portal_2_6_2/build/distrib.xml
Log:
Include all files from jboss As 4.2.1 (except server/all and server/minimal)
Modified: tags/JBoss_Portal_2_6_2/build/distrib.xml
===================================================================
--- tags/JBoss_Portal_2_6_2/build/distrib.xml 2007-09-24 23:12:13 UTC (rev 8477)
+++ tags/JBoss_Portal_2_6_2/build/distrib.xml 2007-09-24 23:19:27 UTC (rev 8478)
@@ -316,11 +316,8 @@
</copy>
<copy todir="${portal.build.normal.bundled}">
<fileset dir="${jboss.home}">
- <include name="bin/**"/>
- <include name="client/**"/>
- <include name="docs/**"/>
- <include name="lib/**"/>
- <include name="server/default/**"/>
+ <exclude name="server/all/**"/>
+ <exclude name="server/minimal/**"/>
</fileset>
</copy>
<copy file="${docs.dir}/readmeFiles/jboss-portal-bin.README" todir="${portal.build.normal.bundled}"/>
16 years, 7 months
JBoss Portal SVN: r8477 - docs/branches/JBoss_Portal_Branch_2_6/quickstartuser/en.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-24 19:12:13 -0400 (Mon, 24 Sep 2007)
New Revision: 8477
Modified:
docs/branches/JBoss_Portal_Branch_2_6/quickstartuser/en/master.xml
Log:
Doc sync
Modified: docs/branches/JBoss_Portal_Branch_2_6/quickstartuser/en/master.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/quickstartuser/en/master.xml 2007-09-24 23:11:55 UTC (rev 8476)
+++ docs/branches/JBoss_Portal_Branch_2_6/quickstartuser/en/master.xml 2007-09-24 23:12:13 UTC (rev 8477)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
"../../docbook-support/support/docbook-dtd/docbookx.dtd" [
-<!ENTITY overview SYSTEM "modules/overview.xml">
+<!ENTITY overview SYSTEM "../../common/en/modules/overview.xml">
<!ENTITY forward SYSTEM "modules/forward.xml">
<!ENTITY installation SYSTEM "modules/installation.xml">
<!ENTITY portalterminology SYSTEM "modules/portalterminology.xml">
16 years, 7 months
JBoss Portal SVN: r8476 - in docs/tags/JBoss_Portal_2_6_2: referenceGuide/en/images/wsrp and 2 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-24 19:11:55 -0400 (Mon, 24 Sep 2007)
New Revision: 8476
Modified:
docs/tags/JBoss_Portal_2_6_2/quickstartuser/en/master.xml
docs/tags/JBoss_Portal_2_6_2/referenceGuide/en/images/wsrp/config_create.png
docs/tags/JBoss_Portal_2_6_2/referenceGuide/en/images/wsrp/config_created.png
docs/tags/JBoss_Portal_2_6_2/referenceGuide/en/images/wsrp/config_end.png
docs/tags/JBoss_Portal_2_6_2/referenceGuide/en/images/wsrp/config_init.png
docs/tags/JBoss_Portal_2_6_2/referenceGuide/en/images/wsrp/config_refresh.png
docs/tags/JBoss_Portal_2_6_2/referenceGuide/en/images/wsrp/config_usewsdl.png
docs/tags/JBoss_Portal_2_6_2/referenceGuide/en/modules/wsrp.xml
docs/tags/JBoss_Portal_2_6_2/userGuide/en/master.xml
Log:
Sync docs
Modified: docs/tags/JBoss_Portal_2_6_2/quickstartuser/en/master.xml
===================================================================
--- docs/tags/JBoss_Portal_2_6_2/quickstartuser/en/master.xml 2007-09-24 22:52:23 UTC (rev 8475)
+++ docs/tags/JBoss_Portal_2_6_2/quickstartuser/en/master.xml 2007-09-24 23:11:55 UTC (rev 8476)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
"../../docbook-support/support/docbook-dtd/docbookx.dtd" [
-<!ENTITY overview SYSTEM "modules/overview.xml">
+<!ENTITY overview SYSTEM "../../common/en/modules/overview.xml">
<!ENTITY forward SYSTEM "modules/forward.xml">
<!ENTITY installation SYSTEM "modules/installation.xml">
<!ENTITY portalterminology SYSTEM "modules/portalterminology.xml">
Modified: docs/tags/JBoss_Portal_2_6_2/referenceGuide/en/images/wsrp/config_create.png
===================================================================
(Binary files differ)
Modified: docs/tags/JBoss_Portal_2_6_2/referenceGuide/en/images/wsrp/config_created.png
===================================================================
(Binary files differ)
Modified: docs/tags/JBoss_Portal_2_6_2/referenceGuide/en/images/wsrp/config_end.png
===================================================================
(Binary files differ)
Modified: docs/tags/JBoss_Portal_2_6_2/referenceGuide/en/images/wsrp/config_init.png
===================================================================
(Binary files differ)
Modified: docs/tags/JBoss_Portal_2_6_2/referenceGuide/en/images/wsrp/config_refresh.png
===================================================================
(Binary files differ)
Modified: docs/tags/JBoss_Portal_2_6_2/referenceGuide/en/images/wsrp/config_usewsdl.png
===================================================================
(Binary files differ)
Modified: docs/tags/JBoss_Portal_2_6_2/referenceGuide/en/modules/wsrp.xml
===================================================================
--- docs/tags/JBoss_Portal_2_6_2/referenceGuide/en/modules/wsrp.xml 2007-09-24 22:52:23 UTC (rev 8475)
+++ docs/tags/JBoss_Portal_2_6_2/referenceGuide/en/modules/wsrp.xml 2007-09-24 23:11:55 UTC (rev 8476)
@@ -307,7 +307,7 @@
<imagedata fileref="images/wsrp/config_usewsdl.png" format="png" align="center" valign="middle"/>
</imageobject>
</mediaobject>
- Enter the WSDL URL for the producer in the text field and press the "Refresh" button. This will retrieve
+ Enter the WSDL URL for the producer in the text field and press the "Save & Refresh" button. This will retrieve
the service description associated with the Producer which WSRP is described by the WSDL file found at
the URL you just entered. In our case, querying the service description will allow us to learn that the
Producer requires registration and that it expects a value for the registration property named
@@ -319,7 +319,7 @@
</mediaobject>
<note>At this point, there is no automated way to learn about which possible values (if any) are
expected by the remote Producer. Please refer to the specific Producer's documentation.</note>
- Enter "public" as the value for the registration property and press "Refresh" once more. You should now
+ Enter "public" as the value for the registration property and press "Save & Refresh" once more. You should now
see something similar to:
<mediaobject>
<imageobject>
Modified: docs/tags/JBoss_Portal_2_6_2/userGuide/en/master.xml
===================================================================
--- docs/tags/JBoss_Portal_2_6_2/userGuide/en/master.xml 2007-09-24 22:52:23 UTC (rev 8475)
+++ docs/tags/JBoss_Portal_2_6_2/userGuide/en/master.xml 2007-09-24 23:11:55 UTC (rev 8476)
@@ -17,11 +17,6 @@
<subtitle>User Guide</subtitle>
<releaseinfo>Release 2.6.2-GA "Ninja"</releaseinfo>
<releaseinfo>October 2007</releaseinfo>
- <author>
- <firstname>Roy</firstname>
- <surname>Russo</surname>
- <email>roy(a)jboss.org</email>
- </author>
</bookinfo>
<toc/>
<!-- portal overview - marketing stuff --> &overview;
16 years, 7 months
JBoss Portal SVN: r8475 - in trunk/core-admin/src: resources/portal-admin-war/WEB-INF/jsf/wizard and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-24 18:52:23 -0400 (Mon, 24 Sep 2007)
New Revision: 8475
Modified:
trunk/core-admin/src/bin/portal-admin-war/style.css
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml
Log:
Add box around the wizard
Modified: trunk/core-admin/src/bin/portal-admin-war/style.css
===================================================================
--- trunk/core-admin/src/bin/portal-admin-war/style.css 2007-09-24 22:47:38 UTC (rev 8474)
+++ trunk/core-admin/src/bin/portal-admin-war/style.css 2007-09-24 22:52:23 UTC (rev 8475)
@@ -1,495 +1,504 @@
-/* Redefine spacing for tables. */
-
-a {
- color: #446688;
- text-decoration: none;
-}
-
-a:hover {
- color: #5078aa;
- text-decoration: underline;
-}
-
-div.admin-ui div.tab-container{
- border-bottom:1px solid #B3C0C7;
- border-right:1px solid #B3C0C7;
- border-left:1px solid #B3C0C7;
- padding: 15px 0 10px 0;
-}
-
-.admin-ui table {
- border: 0;
-}
-
-.admin-ui th {
- text-align: left;
- border: 0;
- border-bottom: 1px solid;
- padding-bottom: 2px;
- padding-top: 2px;
- font-size: 11px;
-}
-
-.admin-ui td {
- padding-bottom: 2px;
- padding-top: 2px;
-}
-
-/* Pagination. */
-
-.admin-ui ul.pagination {
- margin: 0;
- padding: .2em;
-}
-
-.admin-ui ul.pagination li {
- text-align: center;
- list-style-type: none;
- display: inline;
- margin-right: 2px;
-}
-
-.admin-ui ul.pagination li.selected {
- font-weight: bold;
- background-color: #eef;
- border-bottom: 2px solid #656565;
-}
-
-.pagination a, .pagination a:visited, .pagination a:hover {
- text-decoration: none;
-}
-
-/* Top nav. */
-
-.admin-ui ul.topnav {
- padding: 4px 0px 3px;
- border-bottom: 1px solid #b3c0c7;
- margin: 0;
-}
-
-.admin-ui ul.topnav li {
- list-style-type: none;
- display: inline;
- margin: 0;
- padding: 3px 0.5em;
- margin-left: 5px;
- border: 1px solid #b3c0c7;
- border-bottom: none;
- background-color: #f2f4f5;
-}
-
-.admin-ui ul.topnav li:hover {
- background-color: #fff;
-}
-
-.admin-ui ul.topnav li#currentTab {
- background-color: white;
- border-bottom: 1px solid white;
-}
-
-.admin-ui ul.topnav li#currentTab a:hover {
-}
-
-/* Object path. */
-
-.admin-ui ul.objectpath {
- list-style-type: none;
- font-size: 11px;
- border: solid 1px #bbb;
- border-left: solid 1px #eee;
- border-right: solid 1px #eee;
- background-color: #d5d5d5;
- background-image: url( img/pathBackground.png );
- background-position: left;
- background-repeat: repeat-x;
- height: 21px;
- margin: 0px;
- padding: 0px;
- padding-left: 2px;
-}
-
-.admin-ui ul.objectpath li {
- list-style-type: none;
- display: block;
- float: left;
-}
-
-.admin-ui ul li.pathItem {
- padding-top: 4px;
- padding-left: 3px;
- padding-right: 2px;
-}
-
-/*
-.admin-ui ul.li.pathSeparator {
- background-image: url(img/pathSeparator.png);
- background-position: center center;
- background-repeat: no-repeat;
- width: 7px;
-}
-*/
-
-.admin-ui ul.objectpath li.selected {
- font-weight: bold;
- padding-top: 4px;
- padding-left: 3px;
- padding-right: 2px;
-}
-
-.admin-ui ul.objectpath a {
- color: #333333;
- text-decoration: none;
-}
-
-.admin-ui ul.objectpath a:hover {
- color: #5078aa;
- text-decoration: none;
-}
-
-/* Resize combo lists */
-.admin-ui select {
- padding: 2px 4px 2px 1px;
-}
-
-.admin-ui select.contentType {
- width: 8em;
-}
-
-.admin-ui select.instanceList {
- width: 11em;
-}
-
-.admin-ui select.windowList {
- width: 95%;
- overflow: auto;
-}
-
-/* Style a table for form layout */
-.admin-ui table form {
- margin: 0;
-}
-
-.admin-ui table form td.label {
- text-align: right;
- vertical-align: top;
- padding-top: 0.4em;
-}
-
-.admin-ui table form td.widget {
- text-align: left;
-}
-
-/* Area header. */
-
-.admin-ui .portlet-area-header {
- border: 1px solid #54708c;
- font-weight: bold;
- color: #fff;
- font-size: 11px;
- background-color: #5986b3;
- padding: 2px;
- padding-left: 4px;
- margin: 0;
-}
-
-.admin-ui .portlet-area-body {
- border: 1px solid #d5d5d5;
- border-top: 0px;
- background-color: #fff;
- padding: 4px;
- margin: 0;
-}
-
-/* Styles updated and enhanced from the main portal css */
-
-.admin-ui th.portlet-section-title {
- font-weight: bold;
- color: #656565;
- font-size: 11px;
- border: 1px solid #999;
- background-color: #ebf2f5;
- padding-left: 6px;
-}
-
-.admin-ui h3.sectionTitle {
- font-weight: bold;
- color: #656565;
- font-size: 11px;
- border-top: 1px solid #999;
- background-color: #ebf2f5;
- padding: 2px;
- padding-left: 4px;
-}
-
-.admin-ui .portlet-section-header {
- background-image: url( img/pathBackground.png );
- background-position: left;
- background-repeat: repeat-x;
- font-weight: bold;
- color: #656565;
- font-size: 10px;
- border-top: 1px solid #ddd;
- border-bottom: 1px solid #999;
- padding-left: 4px;
-}
-
-.admin-ui .portlet-section-header th {
- background-image: url( img/pathBackground.png );
- background-position: left;
- background-repeat: repeat-x;
- font-weight: bold;
- color: #656565;
- font-size: 10px;
- border-top: 1px solid #ddd;
- border-bottom: 1px solid #999;
- padding-left: 4px;
-}
-
-.admin-ui .portlet-section-body {
- color: #656565;
- border: 1px solid #d5d5d5;
- border-top: 0px;
-}
-
-.admin-ui .portlet-section-alternate {
- background-color: #F2F2F2;
- border: 1px solid #d5d5d5;
-}
-
-.admin-ui .portlet-section-selected {
- background-color: #CBD4E6;
-}
-
-.admin-ui .actionDetails {
- background-image: url( img/actionIcon_Details.gif );
- background-position: left;
- background-repeat: no-repeat;
- line-height: 14px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .actionLayout {
- background-image: url( img/actionIcon_Layout.gif );
- background-position: left;
- background-repeat: no-repeat;
- line-height: 14px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .actionSecurity {
- background-image: url( img/actionIcon_Security.gif );
- background-position: left;
- background-repeat: no-repeat;
- line-height: 14px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .actionProperties {
- background-image: url( img/actionIcon_Properties.gif );
- background-position: left;
- background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- padding-left: 18px;
- white-space: nowrap;
- height: 22px;
-}
-
-.admin-ui .actionTheme {
- background-image: url( img/actionIcon_Theme.gif );
- background-position: left;
- background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .actionRename {
- background-image: url( img/actionIcon_Rename.gif );
- background-position: left;
- background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .actionDelete {
- background-image: url( img/actionIcon_Delete.gif );
- background-position: left;
- background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .actionMakeDefault {
- background-image: url( img/actionIcon_MakeDefault.gif );
- background-position: left;
- background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .actionDefault {
- background-image: url( img/actionIcon_IsDefault.gif );
- background-position: left;
- background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .actionPreferences {
- background-image: url( img/actionIcon_Properties.gif );
- background-position: left;
- background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .actionCreateInstance {
- background-image: url( img/actionIcon_CreateInstance.gif );
- background-position: left;
- background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .portlet-content-center {
- padding: 0;
- margin: 0;
-}
-
-.admin-ui .portlet-body {
- padding: 0;
- margin: 0;
-}
-
-.admin-ui .portlet-content-right {
- padding: 0;
- margin: 0;
-}
-
-.admin-ui .portlet-footer-left {
- padding: 0;
- margin: 0;
-}
-
-.admin-ui .portlet-table-header {
- background-color: #eef;
-}
-
-.admin-ui .portlet-section-buttonrow {
- margin-top: 6px;
- margin-bottom: 6px;
- float: right;
-}
-
-/* Change dashed line to solid. */
-
-.admin-ui hr {
- border-top-style: solid;
-}
-
-.admin-ui .wizardStepBox {
- display: inline;
- float: left;
- border: 1px solid #98B7C6;
- height: 7em;
- width: 9em;
- background-color: #DFE8ED;
- margin: .5em;
-}
-
-.admin-ui .wizardButtonBox {
- margin: 1em;
-}
-
-.admin-ui .wizardContent {
- clear: both;
-}
-
-.admin-ui form {
- padding: 0;
- margin: 0;
-}
-
-.admin-ui #selected.wizardStepBox {
- background-color: #C8DCC4;
- border: 1px solid black;
- border-bottom: 5px solid black;
-}
-
-.admin-ui .stepNumber {
- font-size: 2em;
- text-align: center;
- margin-top: 5px;
- margin-bottom: 0;
-}
-
-.admin-ui .stepText {
- text-align: center;
-}
-
-.admin-ui .layout-button {
- width: 50px;
- margin: 2px;
- padding: 2px;
-}
-
-.admin-ui .createObjectForm {
- display: block;
- padding: 1em 0 0 0;
-}
-
-.admin-ui .objectList {
- width: 100%;
-}
-
-.admin-ui .objectList .objectNameColumn {
- width: 25%;
-}
-
-.admin-ui .objectList .objectActionColumn {
- width: 75%;
-}
-
-.admin-ui .portlet-msg {
- border: 1px solid #bbb;
- margin: 2em auto;
- padding: 1em;
- width: 60%;
-}
-
-.admin-ui .portlet-msg-body {
- position: relative;
- top: -3em;
- left: 3em;
- width: 95%;
-}
-
-.admin-label {
- padding: 0 4px 3px 0;
- display: inline-block;
- vertical-align: middle;
-}
+/* Redefine spacing for tables. */
+
+a {
+ color: #446688;
+ text-decoration: none;
+}
+
+a:hover {
+ color: #5078aa;
+ text-decoration: underline;
+}
+
+div.admin-ui div.tab-container{
+ border-bottom:1px solid #B3C0C7;
+ border-right:1px solid #B3C0C7;
+ border-left:1px solid #B3C0C7;
+ padding: 15px 0 10px 0;
+}
+
+.admin-ui table {
+ border: 0;
+}
+
+.admin-ui th {
+ text-align: left;
+ border: 0;
+ border-bottom: 1px solid;
+ padding-bottom: 2px;
+ padding-top: 2px;
+ font-size: 11px;
+}
+
+.admin-ui td {
+ padding-bottom: 2px;
+ padding-top: 2px;
+}
+
+/* Pagination. */
+
+.admin-ui ul.pagination {
+ margin: 0;
+ padding: .2em;
+}
+
+.admin-ui ul.pagination li {
+ text-align: center;
+ list-style-type: none;
+ display: inline;
+ margin-right: 2px;
+}
+
+.admin-ui ul.pagination li.selected {
+ font-weight: bold;
+ background-color: #eef;
+ border-bottom: 2px solid #656565;
+}
+
+.pagination a, .pagination a:visited, .pagination a:hover {
+ text-decoration: none;
+}
+
+/* Top nav. */
+
+.admin-ui ul.topnav {
+ padding: 4px 0px 3px;
+ border-bottom: 1px solid #b3c0c7;
+ margin: 0;
+}
+
+.admin-ui ul.topnav li {
+ list-style-type: none;
+ display: inline;
+ margin: 0;
+ padding: 3px 0.5em;
+ margin-left: 5px;
+ border: 1px solid #b3c0c7;
+ border-bottom: none;
+ background-color: #f2f4f5;
+}
+
+.admin-ui ul.topnav li:hover {
+ background-color: #fff;
+}
+
+.admin-ui ul.topnav li#currentTab {
+ background-color: white;
+ border-bottom: 1px solid white;
+}
+
+.admin-ui ul.topnav li#currentTab a:hover {
+}
+
+/* Object path. */
+
+.admin-ui ul.objectpath {
+ list-style-type: none;
+ font-size: 11px;
+ border: solid 1px #bbb;
+ border-left: solid 1px #eee;
+ border-right: solid 1px #eee;
+ background-color: #d5d5d5;
+ background-image: url( img/pathBackground.png );
+ background-position: left;
+ background-repeat: repeat-x;
+ height: 21px;
+ margin: 0px;
+ padding: 0px;
+ padding-left: 2px;
+}
+
+.admin-ui ul.objectpath li {
+ list-style-type: none;
+ display: block;
+ float: left;
+}
+
+.admin-ui ul li.pathItem {
+ padding-top: 4px;
+ padding-left: 3px;
+ padding-right: 2px;
+}
+
+/*
+.admin-ui ul.li.pathSeparator {
+ background-image: url(img/pathSeparator.png);
+ background-position: center center;
+ background-repeat: no-repeat;
+ width: 7px;
+}
+*/
+
+.admin-ui ul.objectpath li.selected {
+ font-weight: bold;
+ padding-top: 4px;
+ padding-left: 3px;
+ padding-right: 2px;
+}
+
+.admin-ui ul.objectpath a {
+ color: #333333;
+ text-decoration: none;
+}
+
+.admin-ui ul.objectpath a:hover {
+ color: #5078aa;
+ text-decoration: none;
+}
+
+/* Resize combo lists */
+.admin-ui select {
+ padding: 2px 4px 2px 1px;
+}
+
+.admin-ui select.contentType {
+ width: 8em;
+}
+
+.admin-ui select.instanceList {
+ width: 11em;
+}
+
+.admin-ui select.windowList {
+ width: 95%;
+ overflow: auto;
+}
+
+/* Style a table for form layout */
+.admin-ui table form {
+ margin: 0;
+}
+
+.admin-ui table form td.label {
+ text-align: right;
+ vertical-align: top;
+ padding-top: 0.4em;
+}
+
+.admin-ui table form td.widget {
+ text-align: left;
+}
+
+/* Area header. */
+
+.admin-ui .portlet-area-header {
+ border: 1px solid #54708c;
+ font-weight: bold;
+ color: #fff;
+ font-size: 11px;
+ background-color: #5986b3;
+ padding: 2px;
+ padding-left: 4px;
+ margin: 0;
+}
+
+.admin-ui .portlet-area-body {
+ border: 1px solid #d5d5d5;
+ border-top: 0px;
+ background-color: #fff;
+ padding: 4px;
+ margin: 0;
+}
+
+/* Styles updated and enhanced from the main portal css */
+
+.admin-ui th.portlet-section-title {
+ font-weight: bold;
+ color: #656565;
+ font-size: 11px;
+ border: 1px solid #999;
+ background-color: #ebf2f5;
+ padding-left: 6px;
+}
+
+.admin-ui h3.sectionTitle {
+ font-weight: bold;
+ color: #656565;
+ font-size: 11px;
+ border-top: 1px solid #999;
+ background-color: #ebf2f5;
+ padding: 2px;
+ padding-left: 4px;
+}
+
+.admin-ui .portlet-section-header {
+ background-image: url( img/pathBackground.png );
+ background-position: left;
+ background-repeat: repeat-x;
+ font-weight: bold;
+ color: #656565;
+ font-size: 10px;
+ border-top: 1px solid #ddd;
+ border-bottom: 1px solid #999;
+ padding-left: 4px;
+}
+
+.admin-ui .portlet-section-header th {
+ background-image: url( img/pathBackground.png );
+ background-position: left;
+ background-repeat: repeat-x;
+ font-weight: bold;
+ color: #656565;
+ font-size: 10px;
+ border-top: 1px solid #ddd;
+ border-bottom: 1px solid #999;
+ padding-left: 4px;
+}
+
+.admin-ui .portlet-section-body {
+ color: #656565;
+ border: 1px solid #d5d5d5;
+ border-top: 0px;
+}
+
+.admin-ui .portlet-section-alternate {
+ background-color: #F2F2F2;
+ border: 1px solid #d5d5d5;
+}
+
+.admin-ui .portlet-section-selected {
+ background-color: #CBD4E6;
+}
+
+.admin-ui .actionDetails {
+ background-image: url( img/actionIcon_Details.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ line-height: 14px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionLayout {
+ background-image: url( img/actionIcon_Layout.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ line-height: 14px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionSecurity {
+ background-image: url( img/actionIcon_Security.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ line-height: 14px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionProperties {
+ background-image: url( img/actionIcon_Properties.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ padding-left: 18px;
+ white-space: nowrap;
+ height: 22px;
+}
+
+.admin-ui .actionTheme {
+ background-image: url( img/actionIcon_Theme.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionRename {
+ background-image: url( img/actionIcon_Rename.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionDelete {
+ background-image: url( img/actionIcon_Delete.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionMakeDefault {
+ background-image: url( img/actionIcon_MakeDefault.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionDefault {
+ background-image: url( img/actionIcon_IsDefault.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionPreferences {
+ background-image: url( img/actionIcon_Properties.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionCreateInstance {
+ background-image: url( img/actionIcon_CreateInstance.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .portlet-content-center {
+ padding: 0;
+ margin: 0;
+}
+
+.admin-ui .portlet-body {
+ padding: 0;
+ margin: 0;
+}
+
+.admin-ui .portlet-content-right {
+ padding: 0;
+ margin: 0;
+}
+
+.admin-ui .portlet-footer-left {
+ padding: 0;
+ margin: 0;
+}
+
+.admin-ui .portlet-table-header {
+ background-color: #eef;
+}
+
+.admin-ui .portlet-section-buttonrow {
+ margin-top: 6px;
+ margin-bottom: 6px;
+ float: right;
+}
+
+/* Change dashed line to solid. */
+
+.admin-ui hr {
+ border-top-style: solid;
+}
+
+
+div.admin-ui div.wizard-tab-container {
+ border-bottom:1px solid #B3C0C7;
+ border-right:1px solid #B3C0C7;
+ border-left:1px solid #B3C0C7;
+ padding: 0 0 10px 0;
+ margin: 10px 0 0 0;
+}
+
+.admin-ui .wizardStepBox {
+ display: inline;
+ float: left;
+ border: 1px solid #98B7C6;
+ height: 7em;
+ width: 9em;
+ background-color: #DFE8ED;
+ margin: .5em;
+}
+
+.admin-ui .wizardButtonBox {
+ margin: 1em;
+}
+
+.admin-ui .wizardContent {
+ clear: both;
+}
+
+.admin-ui form {
+ padding: 0;
+ margin: 0;
+}
+
+.admin-ui #selected.wizardStepBox {
+ background-color: #C8DCC4;
+ border: 1px solid black;
+ border-bottom: 5px solid black;
+}
+
+.admin-ui .stepNumber {
+ font-size: 2em;
+ text-align: center;
+ margin-top: 5px;
+ margin-bottom: 0;
+}
+
+.admin-ui .stepText {
+ text-align: center;
+}
+
+.admin-ui .layout-button {
+ width: 50px;
+ margin: 2px;
+ padding: 2px;
+}
+
+.admin-ui .createObjectForm {
+ display: block;
+ padding: 1em 0 0 0;
+}
+
+.admin-ui .objectList {
+ width: 100%;
+}
+
+.admin-ui .objectList .objectNameColumn {
+ width: 25%;
+}
+
+.admin-ui .objectList .objectActionColumn {
+ width: 75%;
+}
+
+.admin-ui .portlet-msg {
+ border: 1px solid #bbb;
+ margin: 2em auto;
+ padding: 1em;
+ width: 60%;
+}
+
+.admin-ui .portlet-msg-body {
+ position: relative;
+ top: -3em;
+ left: 3em;
+ width: 95%;
+}
+
+.admin-label {
+ padding: 0 4px 3px 0;
+ display: inline-block;
+ vertical-align: middle;
+}
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml 2007-09-24 22:47:38 UTC (rev 8474)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml 2007-09-24 22:52:23 UTC (rev 8475)
@@ -6,8 +6,13 @@
xmlns:c="http://java.sun.com/jstl/core"
class="admin-ui">
- <div class="portlet-section-header">Adding a new Portlet</div>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+
+<div class="wizard-tab-container">
+<h3 class="sectionTitle">
+Adding a new Portlet
+</h3>
+
<c:choose>
<c:when test="#{newWindowWizard.currentStep == 0}">
<div class="wizardStepBox" id="selected">
@@ -169,5 +174,5 @@
<h:form>
<p style="text-align: right;"><h:commandLink action="advancedMode">Switch to advanced mode</h:commandLink></p>
</h:form>
-
</div>
+</div>
16 years, 7 months
JBoss Portal SVN: r8474 - in branches/JBoss_Portal_Branch_2_6/core-admin/src: resources/portal-admin-war/WEB-INF/jsf/wizard and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-24 18:47:38 -0400 (Mon, 24 Sep 2007)
New Revision: 8474
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml
Log:
Add box around the wizard
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css 2007-09-24 22:41:26 UTC (rev 8473)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css 2007-09-24 22:47:38 UTC (rev 8474)
@@ -411,6 +411,15 @@
border-top-style: solid;
}
+
+div.admin-ui div.wizard-tab-container {
+ border-bottom:1px solid #B3C0C7;
+ border-right:1px solid #B3C0C7;
+ border-left:1px solid #B3C0C7;
+ padding: 0 0 10px 0;
+ margin: 10px 0 0 0;
+}
+
.admin-ui .wizardStepBox {
display: inline;
float: left;
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml 2007-09-24 22:41:26 UTC (rev 8473)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml 2007-09-24 22:47:38 UTC (rev 8474)
@@ -6,8 +6,13 @@
xmlns:c="http://java.sun.com/jstl/core"
class="admin-ui">
- <div class="portlet-section-header">Adding a new Portlet</div>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+
+<div class="wizard-tab-container">
+<h3 class="sectionTitle">
+Adding a new Portlet
+</h3>
+
<c:choose>
<c:when test="#{newWindowWizard.currentStep == 0}">
<div class="wizardStepBox" id="selected">
@@ -169,5 +174,5 @@
<h:form>
<p style="text-align: right;"><h:commandLink action="advancedMode">Switch to advanced mode</h:commandLink></p>
</h:form>
-
</div>
+</div>
16 years, 7 months
JBoss Portal SVN: r8473 - in tags/JBoss_Portal_2_6_2/core-admin/src: resources/portal-admin-war/WEB-INF/jsf/wizard and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-24 18:41:26 -0400 (Mon, 24 Sep 2007)
New Revision: 8473
Modified:
tags/JBoss_Portal_2_6_2/core-admin/src/bin/portal-admin-war/style.css
tags/JBoss_Portal_2_6_2/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml
Log:
Add a border on the wizard
Modified: tags/JBoss_Portal_2_6_2/core-admin/src/bin/portal-admin-war/style.css
===================================================================
--- tags/JBoss_Portal_2_6_2/core-admin/src/bin/portal-admin-war/style.css 2007-09-24 21:34:19 UTC (rev 8472)
+++ tags/JBoss_Portal_2_6_2/core-admin/src/bin/portal-admin-war/style.css 2007-09-24 22:41:26 UTC (rev 8473)
@@ -411,6 +411,15 @@
border-top-style: solid;
}
+
+div.admin-ui div.wizard-tab-container {
+ border-bottom:1px solid #B3C0C7;
+ border-right:1px solid #B3C0C7;
+ border-left:1px solid #B3C0C7;
+ padding: 0 0 10px 0;
+ margin: 10px 0 0 0;
+}
+
.admin-ui .wizardStepBox {
display: inline;
float: left;
Modified: tags/JBoss_Portal_2_6_2/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml
===================================================================
--- tags/JBoss_Portal_2_6_2/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml 2007-09-24 21:34:19 UTC (rev 8472)
+++ tags/JBoss_Portal_2_6_2/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml 2007-09-24 22:41:26 UTC (rev 8473)
@@ -6,8 +6,13 @@
xmlns:c="http://java.sun.com/jstl/core"
class="admin-ui">
- <div class="portlet-section-header">Adding a new Portlet</div>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+
+<div class="wizard-tab-container">
+<h3 class="sectionTitle">
+Adding a new Portlet
+</h3>
+
<c:choose>
<c:when test="#{newWindowWizard.currentStep == 0}">
<div class="wizardStepBox" id="selected">
@@ -169,5 +174,5 @@
<h:form>
<p style="text-align: right;"><h:commandLink action="advancedMode">Switch to advanced mode</h:commandLink></p>
</h:form>
-
</div>
+</div>
16 years, 7 months
JBoss Portal SVN: r8472 - tags/JBoss_Portal_2_6_2/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-09-24 17:34:19 -0400 (Mon, 24 Sep 2007)
New Revision: 8472
Modified:
tags/JBoss_Portal_2_6_2/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml
Log:
- JBPORTAL-1684: forgot to update message styles.
Modified: tags/JBoss_Portal_2_6_2/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml
===================================================================
--- tags/JBoss_Portal_2_6_2/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml 2007-09-24 21:31:18 UTC (rev 8471)
+++ tags/JBoss_Portal_2_6_2/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml 2007-09-24 21:34:19 UTC (rev 8472)
@@ -14,19 +14,20 @@
<hr/>
<h:form>
-<h:messages errorClass="error" infoClass="info"/>
+<h:messages errorClass="portlet-msg-error" infoClass="portlet-msg-success"/>
<table width="100%" class="portlet-table-body #{consumer.active ? 'active' : 'inactive'}">
<tr>
<th>Producer id:</th>
<td>
- <h:inputText id="id" value="#{consumer.id}"/> <h:message styleClass="error" for="id"/>
+ <h:inputText id="id" value="#{consumer.id}"/> <h:message styleClass="portlet-msg-error" for="id"/>
</td>
</tr>
<tr>
<th>Cache expiration:</th>
<td>
- <h:inputText id="cache" value="#{consumer.cache}"/> (seconds before expiration) <h:message styleClass="error"
- for="cache"/>
+ <h:inputText id="cache" value="#{consumer.cache}"/> (seconds before expiration) <h:message
+ styleClass="portlet-msg-error"
+ for="cache"/>
</td>
</tr>
<tr>
@@ -34,10 +35,11 @@
<td>
<h:selectBooleanCheckbox id="useWSDL" value="#{consumer.useWSDL}" onchange="this.form.submit()"
valueChangeListener="#{consumer.useWSDLListener}" immediate="true"/>Use WSDL?
- <h:message styleClass="error" for="useWSDL"/>
+ <h:message styleClass="portlet-msg-error" for="useWSDL"/>
<c:choose>
<c:when test="#{consumer.useWSDL}">
- <h:inputText id="wsdl" size="70" value="#{consumer.wsdl}"/> <h:message styleClass="error" for="wsdl"/>
+ <h:inputText id="wsdl" size="70" value="#{consumer.wsdl}"/> <h:message styleClass="portlet-msg-error"
+ for="wsdl"/>
</c:when>
<c:otherwise>
@@ -46,27 +48,29 @@
<th>Service Description URL:</th>
<td>
<h:inputText id="sd" size="70" value="#{consumer.serviceDescription}"/> <h:message
- styleClass="error" for="sd"/>
+ styleClass="portlet-msg-error" for="sd"/>
</td>
</tr>
<tr>
<th>Markup URL:</th>
<td>
- <h:inputText id="m" size="70" value="#{consumer.markup}"/> <h:message styleClass="error" for="m"/>
+ <h:inputText id="m" size="70" value="#{consumer.markup}"/> <h:message
+ styleClass="portlet-msg-error" for="m"/>
</td>
</tr>
<tr>
<th>Registration URL:</th>
<td>
- <h:inputText id="r" size="70" value="#{consumer.registration}"/> <h:message styleClass="error"
- for="r"/>
+ <h:inputText id="r" size="70" value="#{consumer.registration}"/> <h:message
+ styleClass="portlet-msg-error"
+ for="r"/>
</td>
</tr>
<tr>
<th>Portlet Management URL:</th>
<td>
<h:inputText id="pm" size="70" value="#{consumer.portletManagement}"/> <h:message
- styleClass="error" for="pm"/>
+ styleClass="portlet-msg-error" for="pm"/>
</td>
</tr>
</table>
@@ -95,7 +99,7 @@
<td>
<h:inputText value="#{prop.value}" size="40" onchange="this.form.submit()"
immediate="true" valueChangeListener="#{consumer.regPropListener}"/>
- <h:outputText styleClass="error" value="#{prop.status}"
+ <h:outputText styleClass="portlet-msg-error" value="#{prop.status}"
rendered="#{prop.determinedInvalid}"/>
</td>
</tr>
@@ -125,7 +129,8 @@
<c:when test="#{consumer.registrationCheckNeeded}">
<tr>
<td colspan="2">
- <p class="info">Registration information hasn't been validated with the Producer. You should validate
+ <p class="portlet-msg-alert">Registration information hasn't been validated with the Producer. You should
+ validate
it.</p>
<h:commandLink action="#{consumer.refreshRegistrationInfo}" value="Validate"
title="Validate registration info from Producer" styleClass="portlet-form-button">
@@ -139,7 +144,7 @@
test="#{!empty consumer.producerInfo.registrationInfo.registrationHandle and !consumer.registrationValid}">
<tr>
<td colspan="2">
- <p class="error">Registration is not valid. You can try to fix the problems and modify the
+ <p class="portlet-msg-error">Registration is not valid. You can try to fix the problems and modify the
registration.</p>
<h:commandLink action="#{consumer.modifyRegistration}" value="Modify registration"
title="Modify the registration held with this Producer"
@@ -161,7 +166,7 @@
</c:if>
<tr>
<td colspan="2" style="padding: 1em 1em 1em 0;">
- <h:commandButton action="#{consumer.update}" value="Save" title="" styleClass="portlet-form-button">
+ <h:commandButton action="#{consumer.update}" value="Save" styleClass="portlet-form-button">
<f:param name="id" value="#{consumer.id}"/>
</h:commandButton>
<h:commandLink action="#{consumer.refreshConsumer}" value="Save & Refresh"
16 years, 7 months
JBoss Portal SVN: r8471 - in trunk/core-wsrp/src/resources/portal-wsrp-admin-war: WEB-INF/jsf/consumers and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-09-24 17:31:18 -0400 (Mon, 24 Sep 2007)
New Revision: 8471
Modified:
trunk/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml
trunk/core-wsrp/src/resources/portal-wsrp-admin-war/style.css
Log:
- JBPORTAL-1684: forgot to update message styles, made hr solid
Modified: trunk/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml
===================================================================
--- trunk/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml 2007-09-24 21:23:53 UTC (rev 8470)
+++ trunk/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml 2007-09-24 21:31:18 UTC (rev 8471)
@@ -14,19 +14,20 @@
<hr/>
<h:form>
-<h:messages errorClass="error" infoClass="info"/>
+<h:messages errorClass="portlet-msg-error" infoClass="portlet-msg-success"/>
<table width="100%" class="portlet-table-body #{consumer.active ? 'active' : 'inactive'}">
<tr>
<th>Producer id:</th>
<td>
- <h:inputText id="id" value="#{consumer.id}"/> <h:message styleClass="error" for="id"/>
+ <h:inputText id="id" value="#{consumer.id}"/> <h:message styleClass="portlet-msg-error" for="id"/>
</td>
</tr>
<tr>
<th>Cache expiration:</th>
<td>
- <h:inputText id="cache" value="#{consumer.cache}"/> (seconds before expiration) <h:message styleClass="error"
- for="cache"/>
+ <h:inputText id="cache" value="#{consumer.cache}"/> (seconds before expiration) <h:message
+ styleClass="portlet-msg-error"
+ for="cache"/>
</td>
</tr>
<tr>
@@ -34,10 +35,11 @@
<td>
<h:selectBooleanCheckbox id="useWSDL" value="#{consumer.useWSDL}" onchange="this.form.submit()"
valueChangeListener="#{consumer.useWSDLListener}" immediate="true"/>Use WSDL?
- <h:message styleClass="error" for="useWSDL"/>
+ <h:message styleClass="portlet-msg-error" for="useWSDL"/>
<c:choose>
<c:when test="#{consumer.useWSDL}">
- <h:inputText id="wsdl" size="70" value="#{consumer.wsdl}"/> <h:message styleClass="error" for="wsdl"/>
+ <h:inputText id="wsdl" size="70" value="#{consumer.wsdl}"/> <h:message styleClass="portlet-msg-error"
+ for="wsdl"/>
</c:when>
<c:otherwise>
@@ -46,27 +48,29 @@
<th>Service Description URL:</th>
<td>
<h:inputText id="sd" size="70" value="#{consumer.serviceDescription}"/> <h:message
- styleClass="error" for="sd"/>
+ styleClass="portlet-msg-error" for="sd"/>
</td>
</tr>
<tr>
<th>Markup URL:</th>
<td>
- <h:inputText id="m" size="70" value="#{consumer.markup}"/> <h:message styleClass="error" for="m"/>
+ <h:inputText id="m" size="70" value="#{consumer.markup}"/> <h:message
+ styleClass="portlet-msg-error" for="m"/>
</td>
</tr>
<tr>
<th>Registration URL:</th>
<td>
- <h:inputText id="r" size="70" value="#{consumer.registration}"/> <h:message styleClass="error"
- for="r"/>
+ <h:inputText id="r" size="70" value="#{consumer.registration}"/> <h:message
+ styleClass="portlet-msg-error"
+ for="r"/>
</td>
</tr>
<tr>
<th>Portlet Management URL:</th>
<td>
<h:inputText id="pm" size="70" value="#{consumer.portletManagement}"/> <h:message
- styleClass="error" for="pm"/>
+ styleClass="portlet-msg-error" for="pm"/>
</td>
</tr>
</table>
@@ -95,7 +99,7 @@
<td>
<h:inputText value="#{prop.value}" size="40" onchange="this.form.submit()"
immediate="true" valueChangeListener="#{consumer.regPropListener}"/>
- <h:outputText styleClass="error" value="#{prop.status}"
+ <h:outputText styleClass="portlet-msg-error" value="#{prop.status}"
rendered="#{prop.determinedInvalid}"/>
</td>
</tr>
@@ -125,7 +129,8 @@
<c:when test="#{consumer.registrationCheckNeeded}">
<tr>
<td colspan="2">
- <p class="info">Registration information hasn't been validated with the Producer. You should validate
+ <p class="portlet-msg-alert">Registration information hasn't been validated with the Producer. You should
+ validate
it.</p>
<h:commandLink action="#{consumer.refreshRegistrationInfo}" value="Validate"
title="Validate registration info from Producer" styleClass="portlet-form-button">
@@ -139,7 +144,7 @@
test="#{!empty consumer.producerInfo.registrationInfo.registrationHandle and !consumer.registrationValid}">
<tr>
<td colspan="2">
- <p class="error">Registration is not valid. You can try to fix the problems and modify the
+ <p class="portlet-msg-error">Registration is not valid. You can try to fix the problems and modify the
registration.</p>
<h:commandLink action="#{consumer.modifyRegistration}" value="Modify registration"
title="Modify the registration held with this Producer"
@@ -161,7 +166,7 @@
</c:if>
<tr>
<td colspan="2" style="padding: 1em 1em 1em 0;">
- <h:commandButton action="#{consumer.update}" value="Save" title="" styleClass="portlet-form-button">
+ <h:commandButton action="#{consumer.update}" value="Save" styleClass="portlet-form-button">
<f:param name="id" value="#{consumer.id}"/>
</h:commandButton>
<h:commandLink action="#{consumer.refreshConsumer}" value="Save & Refresh"
Modified: trunk/core-wsrp/src/resources/portal-wsrp-admin-war/style.css
===================================================================
--- trunk/core-wsrp/src/resources/portal-wsrp-admin-war/style.css 2007-09-24 21:23:53 UTC (rev 8470)
+++ trunk/core-wsrp/src/resources/portal-wsrp-admin-war/style.css 2007-09-24 21:31:18 UTC (rev 8471)
@@ -8,6 +8,10 @@
border: 0;
}
+.wsrp-consumers-ui hr {
+ border-top-style: solid;
+}
+
/* Top nav. */
.wsrp-consumers-ui ul.topnav {
16 years, 7 months
JBoss Portal SVN: r8470 - branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-09-24 17:23:53 -0400 (Mon, 24 Sep 2007)
New Revision: 8470
Modified:
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml
Log:
- JBPORTAL-1684: forgot to update message styles.
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 2007-09-24 21:22:58 UTC (rev 8469)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml 2007-09-24 21:23:53 UTC (rev 8470)
@@ -14,19 +14,20 @@
<hr/>
<h:form>
-<h:messages errorClass="error" infoClass="info"/>
+<h:messages errorClass="portlet-msg-error" infoClass="portlet-msg-success"/>
<table width="100%" class="portlet-table-body #{consumer.active ? 'active' : 'inactive'}">
<tr>
<th>Producer id:</th>
<td>
- <h:inputText id="id" value="#{consumer.id}"/> <h:message styleClass="error" for="id"/>
+ <h:inputText id="id" value="#{consumer.id}"/> <h:message styleClass="portlet-msg-error" for="id"/>
</td>
</tr>
<tr>
<th>Cache expiration:</th>
<td>
- <h:inputText id="cache" value="#{consumer.cache}"/> (seconds before expiration) <h:message styleClass="error"
- for="cache"/>
+ <h:inputText id="cache" value="#{consumer.cache}"/> (seconds before expiration) <h:message
+ styleClass="portlet-msg-error"
+ for="cache"/>
</td>
</tr>
<tr>
@@ -34,10 +35,11 @@
<td>
<h:selectBooleanCheckbox id="useWSDL" value="#{consumer.useWSDL}" onchange="this.form.submit()"
valueChangeListener="#{consumer.useWSDLListener}" immediate="true"/>Use WSDL?
- <h:message styleClass="error" for="useWSDL"/>
+ <h:message styleClass="portlet-msg-error" for="useWSDL"/>
<c:choose>
<c:when test="#{consumer.useWSDL}">
- <h:inputText id="wsdl" size="70" value="#{consumer.wsdl}"/> <h:message styleClass="error" for="wsdl"/>
+ <h:inputText id="wsdl" size="70" value="#{consumer.wsdl}"/> <h:message styleClass="portlet-msg-error"
+ for="wsdl"/>
</c:when>
<c:otherwise>
@@ -46,27 +48,29 @@
<th>Service Description URL:</th>
<td>
<h:inputText id="sd" size="70" value="#{consumer.serviceDescription}"/> <h:message
- styleClass="error" for="sd"/>
+ styleClass="portlet-msg-error" for="sd"/>
</td>
</tr>
<tr>
<th>Markup URL:</th>
<td>
- <h:inputText id="m" size="70" value="#{consumer.markup}"/> <h:message styleClass="error" for="m"/>
+ <h:inputText id="m" size="70" value="#{consumer.markup}"/> <h:message
+ styleClass="portlet-msg-error" for="m"/>
</td>
</tr>
<tr>
<th>Registration URL:</th>
<td>
- <h:inputText id="r" size="70" value="#{consumer.registration}"/> <h:message styleClass="error"
- for="r"/>
+ <h:inputText id="r" size="70" value="#{consumer.registration}"/> <h:message
+ styleClass="portlet-msg-error"
+ for="r"/>
</td>
</tr>
<tr>
<th>Portlet Management URL:</th>
<td>
<h:inputText id="pm" size="70" value="#{consumer.portletManagement}"/> <h:message
- styleClass="error" for="pm"/>
+ styleClass="portlet-msg-error" for="pm"/>
</td>
</tr>
</table>
@@ -95,7 +99,7 @@
<td>
<h:inputText value="#{prop.value}" size="40" onchange="this.form.submit()"
immediate="true" valueChangeListener="#{consumer.regPropListener}"/>
- <h:outputText styleClass="error" value="#{prop.status}"
+ <h:outputText styleClass="portlet-msg-error" value="#{prop.status}"
rendered="#{prop.determinedInvalid}"/>
</td>
</tr>
@@ -125,7 +129,8 @@
<c:when test="#{consumer.registrationCheckNeeded}">
<tr>
<td colspan="2">
- <p class="info">Registration information hasn't been validated with the Producer. You should validate
+ <p class="portlet-msg-alert">Registration information hasn't been validated with the Producer. You should
+ validate
it.</p>
<h:commandLink action="#{consumer.refreshRegistrationInfo}" value="Validate"
title="Validate registration info from Producer" styleClass="portlet-form-button">
@@ -139,7 +144,7 @@
test="#{!empty consumer.producerInfo.registrationInfo.registrationHandle and !consumer.registrationValid}">
<tr>
<td colspan="2">
- <p class="error">Registration is not valid. You can try to fix the problems and modify the
+ <p class="portlet-msg-error">Registration is not valid. You can try to fix the problems and modify the
registration.</p>
<h:commandLink action="#{consumer.modifyRegistration}" value="Modify registration"
title="Modify the registration held with this Producer"
@@ -161,7 +166,7 @@
</c:if>
<tr>
<td colspan="2" style="padding: 1em 1em 1em 0;">
- <h:commandButton action="#{consumer.update}" value="Save" title="" styleClass="portlet-form-button">
+ <h:commandButton action="#{consumer.update}" value="Save" styleClass="portlet-form-button">
<f:param name="id" value="#{consumer.id}"/>
</h:commandButton>
<h:commandLink action="#{consumer.refreshConsumer}" value="Save & Refresh"
16 years, 7 months