Author: julien(a)jboss.com
Date: 2007-04-27 04:22:34 -0400 (Fri, 27 Apr 2007)
New Revision: 7097
Modified:
trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java
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:
- fix DnD handle for decoration : the div decoration renderer was floating elements which
was causing the dnd zone to be only the portlet actions and the title. Adding a div having
style clear:both in the dyna renderer solved the issue.
Modified: trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
===================================================================
--- trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-04-27
04:19:34 UTC (rev 7096)
+++ trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-04-27
08:22:34 UTC (rev 7097)
@@ -461,7 +461,6 @@
*****************************/
.portlet-container {
-/* margin: 10px;*/
padding: 10px;
}
@@ -496,14 +495,6 @@
height: 29px;
min-width: 9px;
background-position: bottom;
- /*
- background-color:#dfe8ed;
- border-top: 1px solid #98b7c6;
- border-bottom: 1px solid #98b7c6;
- border-left: 1px solid #98b7c6;
- width:20px;
- white-space: nowrap;
- */
}
.portlet-titlebar-center {
@@ -511,11 +502,6 @@
background-repeat: repeat-x;
height: 29px;
background-position: bottom;
- /* background-color:#dfe8ed;
- border-top: 1px solid #98b7c6;
- border-bottom: 1px solid #98b7c6;
- white-space: nowrap;
- */
}
.portlet-titlebar-right {
@@ -525,14 +511,6 @@
height: 30px;
min-width: 10px;
background-position: bottom left;
- /*
- background-color:#dfe8ed;
- border-top: 1px solid #98b7c6;
- border-right: 1px solid #98b7c6;
- border-bottom: 1px solid #98b7c6;
- width:10px;
- white-space: nowrap;
- */
}
.portlet-content-left {
Modified:
trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java
===================================================================
---
trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java 2007-04-27
04:19:34 UTC (rev 7096)
+++
trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java 2007-04-27
08:22:34 UTC (rev 7097)
@@ -54,23 +54,27 @@
public void render(RendererContext rendererContext, DecorationRendererContext drc)
throws RenderException
{
PrintWriter markup = rendererContext.getWriter();
+
+ //
renderTitle(rendererContext, drc);
+
+ //
markup.print("<div class=\"portlet-mode-container\">");
- renderModeAndStateLinks(rendererContext, drc, ActionRendererContext.MODES_KEY);
- renderModeAndStateLinks(rendererContext, drc,
ActionRendererContext.WINDOWSTATES_KEY);
+ renderTriggerableActions(rendererContext, drc, ActionRendererContext.MODES_KEY);
+ renderTriggerableActions(rendererContext, drc,
ActionRendererContext.WINDOWSTATES_KEY);
markup.print("</div>");
}
private static void renderTitle(RendererContext ctx, DecorationRendererContext drc)
{
PrintWriter out = ctx.getWriter();
- out.print("<div
class=\"portlet-titlebar-decoration\">");
- out.print("<span class=\"portlet-titlebar-title\">");
+ out.print("<div
class=\"portlet-titlebar-decoration\"></div>");
+ out.print("<span class=\"portlet-titlebar-title\">");
out.print(drc.getTitle());
- out.print("</span></div>");
+ out.print("</span>");
}
- private static void renderModeAndStateLinks(RendererContext ctx,
DecorationRendererContext drc, String selector)
+ private static void renderTriggerableActions(RendererContext ctx,
DecorationRendererContext drc, String selector)
{
Collection modesOrStates = drc.getTriggerableActions(selector);
if (modesOrStates == null)
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-27
04:19:34 UTC (rev 7096)
+++
trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2007-04-27
08:22:34 UTC (rev 7097)
@@ -67,7 +67,14 @@
//
markup.print("<div class=\"dnd-handle\">");
markup.print("<div class=\"dyna-decoration\">\n");
+
+ //
delegate.render(rendererContext, drc);
+
+ // Clear the float that the div decoration renderer uses which prevent the
handle to cover fully the zone
+ markup.print("<div style=\"clear:both;\"/>");
+
+ //
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-04-27
04:19:34 UTC (rev 7096)
+++
trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2007-04-27
08:22:34 UTC (rev 7097)
@@ -51,7 +51,6 @@
delegate = portletRenderer;
}
- /** @see org.jboss.portal.theme.render.renderer.PortletRenderer#render */
public void render(RendererContext rendererContext, PortletRendererContext prc) throws
RenderException
{
doDND(rendererContext, prc);
@@ -74,7 +73,14 @@
//
out.print("<div class=\"dnd-handle\">");
+
+ //
doCatchClicks(rendererContext, prc);
+
+ // Clear the float that the div decoration renderer uses which prevent the
handle to cover fully the zone
+ out.print("<div style=\"clear:both;\"/>");
+
+ //
out.print("</div>");
}
else
Show replies by date