Author: thomas.heute(a)jboss.com Date: 2009-03-11 06:57:12 -0400 (Wed, 11 Mar 2009) New Revision: 13018 Modified: tags/JBoss_Portal_2_7_2/build/build-thirdparty.xml tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renewal/portal_style.css tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/controller/ajax/AjaxCommandFactory.java tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPath.java tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/theme/WindowContextFactory.java tags/JBoss_Portal_2_7_2/theme/src/bin/portal-ajax-war/dyna/style.css tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java Log: Trying to get partial refresh and DnD working in most browsers... Modified: tags/JBoss_Portal_2_7_2/build/build-thirdparty.xml =================================================================== --- tags/JBoss_Portal_2_7_2/build/build-thirdparty.xml 2009-03-11 07:32:08 UTC (rev 13017) +++ tags/JBoss_Portal_2_7_2/build/build-thirdparty.xml 2009-03-11 10:57:12 UTC (rev 13018) @@ -67,7 +67,7 @@ <componentref name="jboss-portal/modules/common" version="1.2.4"/> <componentref name="jboss-portal/modules/web" version="1.2.3"/> <componentref name="jboss-portal/modules/test" version="1.0.4"/> - <componentref name="jboss-portal/modules/portlet" version="2.0.6"/> + <componentref name="jboss-portal/modules/portlet" version="2.0.5"/> <componentref name="jboss-portal/modules/identity" version="1.0.8"/> <componentref name="jboss-portal/modules/cms" version="1.2.4"/> <componentref name="antlr" version="2.7.6-brew"/> Modified: tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renewal/portal_style.css =================================================================== --- tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2009-03-11 07:32:08 UTC (rev 13017) +++ tags/JBoss_Portal_2_7_2/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2009-03-11 10:57:12 UTC (rev 13018) @@ -237,7 +237,7 @@ bottom: 0px; left: 0; min-width: 550px; - z-index: 10; + z-index: 1; } * html ul#tabsHeader { @@ -271,7 +271,7 @@ ul#tabsHeader li a { background-position: top left; background-repeat: no-repeat; - padding: 5px 10px 0 10px; + padding: 5px 15px 0 15px; display: block; height: 29px; font-weight: bold; @@ -321,7 +321,6 @@ margin: 0px; padding: 0px; margin-top: 28px; - z-index: 10; } ul#tabsHeader ul a { @@ -357,8 +356,8 @@ ul#tabsHeader ul li { background: #DFE8ED; color: #5078aa; - padding: 2px; - width: 180px; + padding: 3px; + width: 160px; list-style: none; border: 1px solid #98b7c6; border-width: 0px 1px 1px 1px; @@ -482,7 +481,6 @@ .portlet-mode-container { white-space: nowrap; float: right; - padding: 2px 0 0 0; } .mode-button { Modified: tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/controller/ajax/AjaxCommandFactory.java =================================================================== --- tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/controller/ajax/AjaxCommandFactory.java 2009-03-11 07:32:08 UTC (rev 13017) +++ tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/controller/ajax/AjaxCommandFactory.java 2009-03-11 10:57:12 UTC (rev 13018) @@ -53,7 +53,7 @@ int toPosInt = Integer.parseInt(toPos); // - PortalObjectId tmp = PortalObjectId.parse(windowId, PortalObjectPath.LEGACY_BASE64_FORMAT); + PortalObjectId tmp = PortalObjectId.parse(windowId, PortalObjectPath.SAFEST_FORMAT); // return new MoveWindowCommand(tmp, fromPosInt, fromRegion, toPosInt, toRegion); Modified: tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPath.java =================================================================== --- tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPath.java 2009-03-11 07:32:08 UTC (rev 13017) +++ tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPath.java 2009-03-11 10:57:12 UTC (rev 13018) @@ -567,4 +567,38 @@ } } }; + + /** + * Should only use a-z0-9_ + */ + public static final Format SAFEST_FORMAT = new PortalObjectPath.LegacyFormat() + { + + private final String EQUALS = "_e"; + private final String SLASH = "_s"; + private final String DOT = "_d"; + private final String PLUS = "_p"; + + @Override + public String[] parse(String value) + { + String uncoded = value.replace(EQUALS, "="); + uncoded = uncoded.replace(SLASH, "/"); + uncoded = uncoded.replace(DOT, "."); + uncoded = uncoded.replace(PLUS, "+"); + return LEGACY_BASE64_FORMAT.parse(uncoded); + } + + @Override + public String toString(String[] names, int from, int to) + { + String encoded = LEGACY_BASE64_FORMAT.toString(names, from, to); + encoded = encoded.replace("=", EQUALS); + encoded = encoded.replace("/", SLASH); + encoded = encoded.replace(".", DOT); + encoded = encoded.replace("+", PLUS); + return encoded; + } + }; + } Modified: tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/theme/WindowContextFactory.java =================================================================== --- tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/theme/WindowContextFactory.java 2009-03-11 07:32:08 UTC (rev 13017) +++ tags/JBoss_Portal_2_7_2/core/src/main/org/jboss/portal/core/theme/WindowContextFactory.java 2009-03-11 10:57:12 UTC (rev 13018) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2009, Red Hat Middleware, LLC, and individual * + * Copyright 2006, Red Hat Middleware, LLC, and individual * * contributors as indicated by the @authors tag. See the * * copyright.txt in the distribution for a full listing of * * individual contributors. * @@ -25,11 +25,11 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.core.controller.ControllerContext; +import org.jboss.portal.core.model.portal.PortalObjectPath; import org.jboss.portal.core.model.portal.Window; import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowRenderCommand; import org.jboss.portal.core.model.portal.command.response.MarkupResponse; import org.jboss.portal.core.model.portal.content.WindowRendition; -import org.jboss.portal.portlet.impl.jsr168.PortletUtils; import org.jboss.portal.server.ServerInvocationContext; import org.jboss.portal.server.request.URLContext; import org.jboss.portal.server.request.URLFormat; @@ -84,7 +84,7 @@ // return new WindowContext( - PortletUtils.generateNamespaceFrom(window.getId().toString()), + window.getId().toString(PortalObjectPath.SAFEST_FORMAT), region, order, windowResult); Modified: tags/JBoss_Portal_2_7_2/theme/src/bin/portal-ajax-war/dyna/style.css =================================================================== --- tags/JBoss_Portal_2_7_2/theme/src/bin/portal-ajax-war/dyna/style.css 2009-03-11 07:32:08 UTC (rev 13017) +++ tags/JBoss_Portal_2_7_2/theme/src/bin/portal-ajax-war/dyna/style.css 2009-03-11 10:57:12 UTC (rev 13018) @@ -13,19 +13,12 @@ */ .dnd-handle { cursor: move; + position: relative; min-height: 1.2em; - position: absolute; - top: 10px; - width: 70%; - z-index: 1; height: auto !important; height: 1.2em; } -.dyna-decoration { - position: relative; -} - .dnd-droppable { border: red 1px dashed; background-color: Transparent; Modified: tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java =================================================================== --- tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2009-03-11 07:32:08 UTC (rev 13017) +++ tags/JBoss_Portal_2_7_2/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2009-03-11 10:57:12 UTC (rev 13018) @@ -66,13 +66,15 @@ DynaWindowRenderer.handleProvided.set(Boolean.TRUE); // + markup.print("<div class=\"dnd-handle\">"); markup.print("<div class=\"dyna-decoration\">\n"); - markup.print("<div class=\"dnd-handle\"></div>"); delegate.render(rendererContext, drc); // Close dnd-decoration markup.print("</div>"); + // Close dnd-handle + markup.print("</div>"); } else