Author: chris.laprun(a)jboss.com
Date: 2007-07-17 19:51:08 -0400 (Tue, 17 Jul 2007)
New Revision: 7813
Modified:
trunk/core-admin/src/bin/portal-admin-war/style.css
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml
Log:
- Fixed incorrect form styling in admin GUI.
- Fixed improper display of select elements.
- Introduced constants for text in ControlPropertiesBean.
Modified: trunk/core-admin/src/bin/portal-admin-war/style.css
===================================================================
--- trunk/core-admin/src/bin/portal-admin-war/style.css 2007-07-17 23:45:37 UTC (rev
7812)
+++ trunk/core-admin/src/bin/portal-admin-war/style.css 2007-07-17 23:51:08 UTC (rev
7813)
@@ -94,7 +94,7 @@
/* Resize combo lists */
.admin-ui select {
- padding: 2px 4px;
+ padding: 2px 4px 2px 1px;
}
.admin-ui select.contentType {
@@ -111,17 +111,17 @@
}
/* Style a table for form layout */
-
-.admin-ui table.form {
+.admin-ui table form {
+ margin: 0;
}
-.admin-ui table.form td.label {
+.admin-ui table form td.label {
text-align: right;
vertical-align: top;
padding-top: 0.4em;
}
-.admin-ui table.form td.widget {
+.admin-ui table form td.widget {
text-align: left;
}
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java
===================================================================
---
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java 2007-07-17
23:45:37 UTC (rev 7812)
+++
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java 2007-07-17
23:51:08 UTC (rev 7813)
@@ -44,6 +44,9 @@
/** . */
final PortalObjectManagerBean pomgr;
+ private static final String DISPLAY_THE_DEFAULT_ERROR_MESSAGE = "Display the
default error message";
+ private static final String REDIRECT_TO_THE_SPECIFIED_RESOURCE = "Redirect to the
specified resource";
+ private static final String REMOVE_THE_RESOURCE_FROM_PAGE = "Remove the resource
from page";
public ControlPropertiesBean(PortalObjectManagerBean pomgr)
{
@@ -56,8 +59,8 @@
if (portalSelectItems == null)
{
portalSelectItems = new ArrayList();
- portalSelectItems.add(new SelectItem(ControlConstants.IGNORE_CONTROL_VALUE,
"display the default error message."));
- portalSelectItems.add(new SelectItem(ControlConstants.JSP_CONTROL_VALUE,
"redirect to the specified resource."));
+ portalSelectItems.add(new SelectItem(ControlConstants.IGNORE_CONTROL_VALUE,
DISPLAY_THE_DEFAULT_ERROR_MESSAGE));
+ portalSelectItems.add(new SelectItem(ControlConstants.JSP_CONTROL_VALUE,
REDIRECT_TO_THE_SPECIFIED_RESOURCE));
}
return portalSelectItems;
}
@@ -67,9 +70,9 @@
if (pageSelectItems == null)
{
pageSelectItems = new ArrayList();
- pageSelectItems.add(new SelectItem(ControlConstants.IGNORE_CONTROL_VALUE,
"display the default error message."));
- pageSelectItems.add(new SelectItem(ControlConstants.HIDE_CONTROL_VALUE,
"remove the resource from page."));
- pageSelectItems.add(new SelectItem(ControlConstants.JSP_CONTROL_VALUE,
"redirect to the specified resource."));
+ pageSelectItems.add(new SelectItem(ControlConstants.IGNORE_CONTROL_VALUE,
DISPLAY_THE_DEFAULT_ERROR_MESSAGE));
+ pageSelectItems.add(new SelectItem(ControlConstants.HIDE_CONTROL_VALUE,
REMOVE_THE_RESOURCE_FROM_PAGE));
+ pageSelectItems.add(new SelectItem(ControlConstants.JSP_CONTROL_VALUE,
REDIRECT_TO_THE_SPECIFIED_RESOURCE));
}
return pageSelectItems;
}
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-07-17
23:45:37 UTC (rev 7812)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-07-17
23:51:08 UTC (rev 7813)
@@ -34,8 +34,7 @@
</tr>
<tr>
<td>
- <h:selectOneMenu id="predefinedProperty"
styleClass="portlet-form-field"
-
value="#{properties.action.selectedProperty}">
+ <h:selectOneMenu id="predefinedProperty"
value="#{properties.action.selectedProperty}">
<f:selectItems
value="#{properties.propertyItems}"/>
</h:selectOneMenu>
</td>
Show replies by date