9:10 p.m.
Author: wesleyhales
Date: 2009-02-23 22:10:16 -0500 (Mon, 23 Feb 2009)
New Revision: 12868
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css
branches/JBoss_Portal_Branch_2_7/theme/src/bin/portal-ajax-war/dyna/style.css
branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java
branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java
Log:
JBPORTAL-2226 - DnD handle fix/enhancement
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2009-02-23
22:31:32 UTC (rev 12867)
+++
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2009-02-24
03:10:16 UTC (rev 12868)
@@ -489,12 +489,14 @@
.portlet-mode-container {
white-space: nowrap;
float:right;
+ position:relative;
+ z-index:1;
}
.mode-button {
/*position:absolute;*/
margin-right: 3px;
- padding-top:5px;
+ /*padding-top:5px;*/
float:left;
}
@@ -504,7 +506,7 @@
font-size: 12px;
font-weight: bold;
white-space: nowrap;
- line-height: 100%;
+ line-height: 3px;
float: left;
text-indent: 5px;
padding-top: 5px;
@@ -513,6 +515,24 @@
margin-right:10px;
}
+.portlet-titlebar-dyna {
+ color: #656565;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ font-weight: bold;
+ white-space: nowrap;
+ line-height: 3px;
+ float: left;
+ text-indent: 5px;
+ padding-top: 5px;
+ padding-bottom: 6px;
+ display:block;
+ margin-right:10px;
+ position:absolute;
+ width: 100%;
+ z-index: 1;
+}
+
/* ------ NOT CURRENTLY IN USE FOR NEW 2.6 FUNCTIONALITY -------
.portlet-titlebar-decoration {}
*/
@@ -523,15 +543,15 @@
width: 9px;
height: 29px;
min-width: 9px;
- background-position: 0 1px;
+ background-position: 0 0;
}
.portlet-titlebar-center {
background-image: url( images/portlet-top-middle2.gif );
background-repeat: repeat-x;
height: 29px;
- background-position: bottom;
- position:relative;
+ background-position: top;
+ /*position:relative;*/
}
.portlet-titlebar-right {
@@ -540,7 +560,7 @@
width: 10px;
height: 30px;
min-width: 10px;
- background-position: -1px 1px;
+ background-position: -1px 0;
}
.portlet-content-left {
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml 2009-02-23
22:31:32 UTC (rev 12867)
+++
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml 2009-02-24
03:10:16 UTC (rev 12868)
@@ -1,4 +1,4 @@
-<div xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
+<div xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
<h:form id="common-edit-theme-form">
Modified: branches/JBoss_Portal_Branch_2_7/theme/src/bin/portal-ajax-war/dyna/style.css
===================================================================
---
branches/JBoss_Portal_Branch_2_7/theme/src/bin/portal-ajax-war/dyna/style.css 2009-02-23
22:31:32 UTC (rev 12867)
+++
branches/JBoss_Portal_Branch_2_7/theme/src/bin/portal-ajax-war/dyna/style.css 2009-02-24
03:10:16 UTC (rev 12868)
@@ -9,6 +9,7 @@
.dnd-handle {
cursor: move;
+ position:relative;
}
Modified:
branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java 2009-02-23
22:31:32 UTC (rev 12867)
+++
branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java 2009-02-24
03:10:16 UTC (rev 12868)
@@ -30,6 +30,8 @@
import org.jboss.portal.theme.render.renderer.ActionRendererContext;
import org.jboss.portal.theme.render.renderer.DecorationRenderer;
import org.jboss.portal.theme.render.renderer.DecorationRendererContext;
+import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions;
+import org.jboss.portal.theme.impl.render.dynamic.DynaConstants;
import java.io.PrintWriter;
import java.util.Collection;
@@ -53,10 +55,13 @@
public void render(RendererContext rendererContext, DecorationRendererContext drc)
throws RenderException
{
+ DynaRenderOptions options =
(DynaRenderOptions)rendererContext.getAttribute(DynaConstants.RENDER_OPTIONS);
PrintWriter markup = rendererContext.getWriter();
- //
- renderTitle(rendererContext, drc);
+ //Don't want title if this is DND, we already have it in
DynaDecorationRenderer
+ if (DynaRenderOptions.NO_AJAX.equals(options)){
+ renderTitle(rendererContext, drc);
+ }
markup.print("<div class=\"portlet-mode-container\">");
renderTriggerableActions(rendererContext, drc, ActionRendererContext.MODES_KEY);
Modified:
branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2009-02-23
22:31:32 UTC (rev 12867)
+++
branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2009-02-24
03:10:16 UTC (rev 12868)
@@ -27,6 +27,7 @@
import org.jboss.portal.theme.render.RendererContext;
import org.jboss.portal.theme.render.renderer.DecorationRenderer;
import org.jboss.portal.theme.render.renderer.DecorationRendererContext;
+import org.jboss.portal.theme.impl.render.div.DivDecorationRenderer;
import java.io.PrintWriter;
@@ -68,12 +69,19 @@
markup.print("<div class=\"dnd-handle\">");
markup.print("<div class=\"dyna-decoration\">\n");
- //
+ //We need the title inside of the dnd-handle
+ markup.print("<div
class=\"portlet-titlebar-decoration\"></div>");
+ markup.print("<span
class=\"portlet-titlebar-dyna\">");
+ markup.print(drc.getTitle());
+ markup.print("</span>");
+
+ // Close dnd-region
+ markup.print("</div>");
+ // Close dyna-region
+ markup.print("</div>");
+
delegate.render(rendererContext, drc);
- //end element in DivDecorationRenderer
- /*markup.print("</div>\n");
- markup.print("</div>\n");*/
}
else
{