Author: thomas.heute(a)jboss.com Date: 2007-07-04 19:21:44 -0400 (Wed, 04 Jul 2007) New Revision: 7668 Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml trunk/theme/src/bin/portal-ajax-war/dyna/style.css trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java Log: Apply fixes from 2.6 Branch. Fixing: JBPORTAL-1531, JBPORTAL-1526 Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2007-07-04 23:09:48 UTC (rev 7667) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2007-07-04 23:21:44 UTC (rev 7668) @@ -33,7 +33,7 @@ </td> <td> <h:selectBooleanCheckbox disabled="#{!properties.pageControlAccessDenied.inheritable}" - styleClass="portlet-form-button" onchange="submit();" + onchange="submit();" valueChangeListener="#{properties.pageControlAccessDenied.inherit}" value="#{properties.pageControlAccessDenied.inherited}"/>inherit action from parent @@ -51,7 +51,7 @@ </td> <td> <h:selectBooleanCheckbox disabled="#{!properties.pageControlUnavailable.inheritable}" - styleClass="portlet-form-button" onchange="submit();" + onchange="submit();" valueChangeListener="#{properties.pageControlUnavailable.inherit}" value="#{properties.pageControlUnavailable.inherited}"/>inherit action from parent @@ -69,7 +69,7 @@ </td> <td> <h:selectBooleanCheckbox disabled="#{!properties.pageControlError.inheritable}" - styleClass="portlet-form-button" onchange="submit();" + onchange="submit();" valueChangeListener="#{properties.pageControlError.inherit}" value="#{properties.pageControlError.inherited}"/>inherit action from parent @@ -87,7 +87,7 @@ </td> <td> <h:selectBooleanCheckbox disabled="#{!properties.pageControlInternalError.inheritable}" - styleClass="portlet-form-button" onchange="submit();" + onchange="submit();" valueChangeListener="#{properties.pageControlInternalError.inherit}" value="#{properties.pageControlInternalError.inherited}"/>inherit action from parent @@ -105,7 +105,7 @@ </td> <td> <h:selectBooleanCheckbox disabled="#{!properties.pageControlNotFound.inheritable}" - styleClass="portlet-form-button" onchange="submit();" + onchange="submit();" valueChangeListener="#{properties.pageControlNotFound.inherit}" value="#{properties.pageControlNotFound.inherited}"/>inherit action from parent @@ -123,7 +123,7 @@ </td> <td> <h:selectBooleanCheckbox disabled="#{!properties.pageControlResourceURI.inheritable}" - styleClass="portlet-form-button" onchange="submit();" + onchange="submit();" valueChangeListener="#{properties.pageControlResourceURI.inherit}" value="#{properties.pageControlResourceURI.inherited}"/>inherit action from parent Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-07-04 23:09:48 UTC (rev 7667) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-07-04 23:21:44 UTC (rev 7668) @@ -114,11 +114,11 @@ value="#{pageManager.windowItemsMap[regionName]}"/> </h:selectManyListbox> </td> - <td valign="top"> + <td valign="top" width="250"> <h:commandButton value="Up" id="u_#{regionName}" actionListener="#{pageManager.assignWindows}" - styleClass="portlet-form-button layout-button"/> + styleClass="portlet-form-button layout-button"/><br/> <h:commandButton value="Down" id="d_#{regionName}" actionListener="#{pageManager.assignWindows}" Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2007-07-04 23:09:48 UTC (rev 7667) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2007-07-04 23:21:44 UTC (rev 7668) @@ -33,7 +33,7 @@ </td> <td> <h:selectBooleanCheckbox disabled="#{!properties.portalControlAccessDenied.inheritable}" - styleClass="portlet-form-button" onchange="submit();" + onchange="submit();" valueChangeListener="#{properties.portalControlAccessDenied.inherit}" value="#{properties.portalControlAccessDenied.inherited}"/>inherit action from parent @@ -52,7 +52,7 @@ </td> <td> <h:selectBooleanCheckbox disabled="#{!properties.portalControlUnavailable.inheritable}" - styleClass="portlet-form-button" onchange="submit();" + onchange="submit();" valueChangeListener="#{properties.portalControlUnavailable.inherit}" value="#{properties.portalControlUnavailable.inherited}"/>inherit action from parent @@ -71,7 +71,7 @@ </td> <td> <h:selectBooleanCheckbox disabled="#{!properties.portalControlError.inheritable}" - styleClass="portlet-form-button" onchange="submit();" + onchange="submit();" valueChangeListener="#{properties.portalControlError.inherit}" value="#{properties.portalControlError.inherited}"/>inherit action from parent @@ -89,7 +89,7 @@ </td> <td> <h:selectBooleanCheckbox disabled="#{!properties.portalControlInternalError.inheritable}" - styleClass="portlet-form-button" onchange="submit();" + onchange="submit();" valueChangeListener="#{properties.portalControlInternalError.inherit}" value="#{properties.portalControlInternalError.inherited}"/>inherit action from parent @@ -108,7 +108,7 @@ </td> <td> <h:selectBooleanCheckbox disabled="#{!properties.portalControlNotFound.inheritable}" - styleClass="portlet-form-button" onchange="submit();" + onchange="submit();" valueChangeListener="#{properties.portalControlNotFound.inherit}" value="#{properties.portalControlNotFound.inherited}"/>inherit action from parent @@ -126,7 +126,7 @@ </td> <td> <h:selectBooleanCheckbox disabled="#{!properties.portalControlResourceURI.inheritable}" - styleClass="portlet-form-button" onchange="submit();" + onchange="submit();" valueChangeListener="#{properties.portalControlResourceURI.inherit}" value="#{properties.portalControlResourceURI.inherited}"/>inherit action from parent Modified: trunk/theme/src/bin/portal-ajax-war/dyna/style.css =================================================================== --- trunk/theme/src/bin/portal-ajax-war/dyna/style.css 2007-07-04 23:09:48 UTC (rev 7667) +++ trunk/theme/src/bin/portal-ajax-war/dyna/style.css 2007-07-04 23:21:44 UTC (rev 7668) @@ -9,15 +9,9 @@ .dnd-handle { cursor: move; + overflow: auto; } -.dnd-cleaner { - clear:both; - height:1px; - margin: -1px 0 0 0; padding:0; - border:none; - visibility: hidden; -} .dnd-droppable { border: red 1px dashed; Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2007-07-04 23:09:48 UTC (rev 7667) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2007-07-04 23:21:44 UTC (rev 7668) @@ -71,9 +71,6 @@ // delegate.render(rendererContext, drc); - // Clear the float that the div decoration renderer uses which prevent the handle to cover fully the zone - markup.print("<hr class=\"dnd-cleaner\"/>"); - // markup.print("</div>\n"); markup.print("</div>\n"); Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2007-07-04 23:09:48 UTC (rev 7667) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2007-07-04 23:21:44 UTC (rev 7668) @@ -77,9 +77,6 @@ // doCatchClicks(rendererContext, prc); - // Clear the float that the div decoration renderer uses which prevent the handle to cover fully the zone - out.print("<hr class=\"dnd-cleaner\"/>"); - // out.print("</div>"); }