Author: julien(a)jboss.com Date: 2007-04-26 05:53:36 -0400 (Thu, 26 Apr 2007) New Revision: 7064 Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 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 trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderOptions.java trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderStatus.java Log: fixed the mouse shape and the droppable highlights Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2007-04-26 09:42:59 UTC (rev 7063) +++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2007-04-26 09:53:36 UTC (rev 7064) @@ -79,9 +79,6 @@ private static Logger log = Logger.getLogger(PageCustomizerInterceptor.class); /** . */ - private static final DynaRenderOptions NO_AJAX_OPTIONS = DynaRenderOptions.getOptions(Boolean.FALSE, Boolean.FALSE); - - /** . */ private String targetContextPath; /** . */ @@ -130,7 +127,7 @@ // Region region = rendition.getPageResult().getRegion2("navigation"); - NO_AJAX_OPTIONS.setOptions(region.getProperties()); + DynaRenderOptions.NO_AJAX.setOptions(region.getProperties()); } } @@ -148,7 +145,7 @@ // Region region = rendition.getPageResult().getRegion2("dashboardnav"); - NO_AJAX_OPTIONS.setOptions(region.getProperties()); + DynaRenderOptions.NO_AJAX.setOptions(region.getProperties()); } } Modified: trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js =================================================================== --- trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 2007-04-26 09:42:59 UTC (rev 7063) +++ trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 2007-04-26 09:53:36 UTC (rev 7064) @@ -24,7 +24,7 @@ function snapshot() { // Find draggable regions - var regions_on_page = document.getElementsByClassName("dyna-region"); + var regions_on_page = document.getElementsByClassName("dnd-region"); // Save current state in the DOM itself for(var i = 0;i < regions_on_page.length;i++) { @@ -275,12 +275,12 @@ }; // Find the draggable regions - var regions_on_page = document.getElementsByClassName("dyna-region"); + var regions_on_page = document.getElementsByClassName("dnd-region"); // Create draggable regions for(var i = 0;i < regions_on_page.length;i++) { var region = regions_on_page[i]; - Sortable.create(region, {dropOnEmpty:true,handle:"dyna-handle",tag:"div",containment:regions_on_page,constraint:false}); + Sortable.create(region, {dropOnEmpty:true,handle:"dnd-handle",tag:"div",containment:regions_on_page,constraint:false,hoverclass:"dnd-droppable"}); } // Modified: trunk/theme/src/bin/portal-ajax-war/dyna/style.css =================================================================== --- trunk/theme/src/bin/portal-ajax-war/dyna/style.css 2007-04-26 09:42:59 UTC (rev 7063) +++ trunk/theme/src/bin/portal-ajax-war/dyna/style.css 2007-04-26 09:53:36 UTC (rev 7064) @@ -1,8 +1,20 @@ /* We need the min-height in order to have a region that is never empty and can receive draggables min-height doees not work on IE6 and the 2 other lines are there to make it work in that situation. 32 pixels is the height of the region when it is empty. */ -div.dyna-region { +.dnd-region { min-height:32px; height:auto !important; height:32px; } + +.dnd-handle { + cursor: move; +} + +.dnd-droppable { + border-right: red 1px dashed; + border-top: red 1px dashed; + border-left: red 1px dashed; + border-bottom: red 1px dashed; + background-color: Transparent; +} 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-04-26 09:42:59 UTC (rev 7063) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2007-04-26 09:53:36 UTC (rev 7064) @@ -63,7 +63,7 @@ DynaWindowRenderer.handleProvided.set(Boolean.TRUE); // - markup.print("<div class=\"dyna-handle\">"); + markup.print("<div class=\"dnd-handle\">"); markup.print("<div class=\"dyna-decoration\">\n"); delegate.render(rendererContext, drc); 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-04-26 09:42:59 UTC (rev 7063) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2007-04-26 09:53:36 UTC (rev 7064) @@ -71,10 +71,12 @@ DynaWindowRenderer.handleProvided.set(Boolean.TRUE); // -// StringBuffer out = renderContext.getMarkupFragment(); -// out.append("<span class=\"handle\">"); + PrintWriter out = rendererContext.getWriter(); + + // + out.print("<span class=\"dnd-handle\">"); doCatchClicks(rendererContext, prc); -// out.append("</span>"); + out.print("</span>"); } else { Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2007-04-26 09:42:59 UTC (rev 7063) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2007-04-26 09:53:36 UTC (rev 7064) @@ -98,7 +98,7 @@ public void endContext(RendererContext rendererContext, ObjectRendererContext objectRenderContext) { - if (DynaRenderStatus.get(rendererContext)) + if (DynaRenderStatus.isActive(rendererContext)) { rendererContext.setAttribute(DynaConstants.RENDER_OPTIONS, null); } @@ -157,8 +157,12 @@ } // - if (DynaRenderStatus.get(rendererContext)) + if (DynaRenderStatus.isActive(rendererContext)) { + // + markup.print("<div class=\"dyna-region\">"); + + // delegate.renderHeader(rendererContext, rrc); // @@ -167,7 +171,7 @@ // if (options.isDnDEnabled()) { - markup.print("<div class=\"dyna-region\" id=\""); + markup.print("<div class=\"dnd-region\" id=\""); markup.print(rrc.getId()); markup.print("\">"); } @@ -179,7 +183,7 @@ */ public void renderBody(RendererContext rendererContext, final RegionRendererContext rrc) throws RenderException { - if (DynaRenderStatus.get(rendererContext)) + if (DynaRenderStatus.isActive(rendererContext)) { delegate.renderBody(rendererContext, rrc); } @@ -187,17 +191,22 @@ public void renderFooter(RendererContext rendererContext, RegionRendererContext rrc) throws RenderException { - if (DynaRenderStatus.get(rendererContext)) + if (DynaRenderStatus.isActive(rendererContext)) { DynaRenderOptions options = (DynaRenderOptions)rendererContext.getAttribute(DynaConstants.RENDER_OPTIONS); // + PrintWriter markup = rendererContext.getWriter(); + + // Close dnd-region if (options.isDnDEnabled()) { - PrintWriter markup = rendererContext.getWriter(); markup.print("</div>"); } + // Close dyna-region + markup.print("</div>"); + // delegate.renderFooter(rendererContext, rrc); } Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderOptions.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderOptions.java 2007-04-26 09:42:59 UTC (rev 7063) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderOptions.java 2007-04-26 09:53:36 UTC (rev 7064) @@ -81,6 +81,10 @@ return getOptions(dndValue, partialRefreshValue); } + /** . */ + public static final DynaRenderOptions NO_AJAX = DynaRenderOptions.getOptions(Boolean.FALSE, Boolean.FALSE); + + /** * Set the options on the specifed property map. * Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderStatus.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderStatus.java 2007-04-26 09:42:59 UTC (rev 7063) +++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRenderStatus.java 2007-04-26 09:53:36 UTC (rev 7064) @@ -31,21 +31,21 @@ public class DynaRenderStatus { - public static boolean get(RendererContext rendererContext) + public static boolean isActive(RendererContext rendererContext) { - Boolean status = (Boolean)rendererContext.getAttribute(DynaConstants.RENDER_STATUS); - return status == null || status.booleanValue(); + Boolean active = (Boolean)rendererContext.getAttribute(DynaConstants.RENDER_STATUS); + return active == null || active.booleanValue(); } public static boolean remove(RendererContext rendererContext) { - Boolean status = (Boolean)rendererContext.getAttribute(DynaConstants.RENDER_STATUS); + Boolean active = (Boolean)rendererContext.getAttribute(DynaConstants.RENDER_STATUS); rendererContext.setAttribute(DynaConstants.RENDER_STATUS, null); - return status == null || status.booleanValue(); + return active == null || active.booleanValue(); } - public static void set(RendererContext rendererContext, boolean status) + public static void set(RendererContext rendererContext, boolean active) { - rendererContext.setAttribute(DynaConstants.RENDER_STATUS, Boolean.valueOf(status)); + rendererContext.setAttribute(DynaConstants.RENDER_STATUS, Boolean.valueOf(active)); } }