[jboss-svn-commits] JBoss Portal SVN: r5213 - in trunk/theme/src/main/org/jboss/portal/theme: impl/render/dynamic render/region
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Sep 16 01:29:02 EDT 2006
Author: roy.russo at jboss.com
Date: 2006-09-16 01:29:00 -0400 (Sat, 16 Sep 2006)
New Revision: 5213
Added:
trunk/theme/src/main/org/jboss/portal/theme/render/region/AJAXFooter.java
Removed:
trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRendererTools.java
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/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/DynaWindowRenderer.java
trunk/theme/src/main/org/jboss/portal/theme/render/region/AJAXScripts.java
Log:
JBPORTAL-1040
- JS Library changed to address usability issues:
- ordering of windows can take place at top or bottom
- window onDrag is similar to netvibes behaviour
- DynaRenderer classes formatted
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 2006-09-16 05:25:07 UTC (rev 5212)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java 2006-09-16 05:29:00 UTC (rev 5213)
@@ -43,11 +43,9 @@
private DecorationRenderer delegate;
- public DynaDecorationRenderer(DecorationRenderer decorationRenderer) throws InstantiationException,
- IllegalAccessException, ClassNotFoundException
+ public DynaDecorationRenderer(DecorationRenderer decorationRenderer)
{
super();
- //delegate = (DecorationRenderer) DynaRendererTools.getRendererClass(DynaRendererTools.DECOR_CLASS).newInstance();
delegate = decorationRenderer;
}
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 2006-09-16 05:25:07 UTC (rev 5212)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java 2006-09-16 05:29:00 UTC (rev 5213)
@@ -22,7 +22,6 @@
package org.jboss.portal.theme.impl.render.dynamic;
-import org.jboss.portal.theme.impl.render.div.DivPortletRenderer;
import org.jboss.portal.theme.page.WindowContext;
import org.jboss.portal.theme.page.WindowResult;
import org.jboss.portal.theme.render.PortletRenderer;
@@ -46,7 +45,6 @@
IllegalAccessException, ClassNotFoundException
{
super();
- //delegate = (PortletRenderer) DynaRendererTools.getRendererClass(DynaRendererTools.PORLTET_CLASS).newInstance();
delegate = portletRenderer;
}
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 2006-09-16 05:25:07 UTC (rev 5212)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java 2006-09-16 05:29:00 UTC (rev 5213)
@@ -23,7 +23,6 @@
package org.jboss.portal.theme.impl.render.dynamic;
import org.jboss.logging.Logger;
-import org.jboss.portal.theme.impl.render.div.DivRegionRenderer;
import org.jboss.portal.theme.page.Region;
import org.jboss.portal.theme.render.RegionRenderer;
import org.jboss.portal.theme.render.RenderContext;
@@ -53,7 +52,6 @@
IllegalAccessException, ClassNotFoundException
{
super();
- //delegate = (RegionRenderer) DynaRendererTools.getRendererClass(DynaRendererTools.REGION_CLASS).newInstance();
delegate = regionRenderer;
}
@@ -63,15 +61,6 @@
public void render(RenderContext renderContext, Region region,
Map portletContexts, Map windowResults) throws RenderException
{
-
-/* Don't delete me!
- if(renderContext.getLayoutRegionNames().get(0).equals(region.getId()))
- {
- // add DND headers
- renderContext.getMarkupFragment().append(DynaRendererTools.getScriptHeaders(renderContext.getLayoutInfo().getContextPath()));
- }
-*/
-
renderContext.getMarkupFragment().append(
"<div id=\"regionDD" + renderContext.getRegionID() + "\">\n");
@@ -79,89 +68,10 @@
renderContext.getMarkupFragment().append("</div>\n");
+
if(portletPos.get(renderContext.getRegionID()) != null
&& ((Integer) portletPos.get(renderContext.getRegionID())).intValue() > 0)
{
- renderContext.getMarkupFragment().append(
- "\n<script type='text/javascript'>\n");
- renderContext.getMarkupFragment().append(
- "YAHOO.example.DDApp" + renderContext.getRegionID()
- + " = function() {\n");
- renderContext.getMarkupFragment().append(" var ");
- for(int i = 0; i < ((Integer) portletPos.get(renderContext.getRegionID())).intValue(); i++)
- {
- // add portlet vars
- renderContext.getMarkupFragment().append(
- "ddPortlet" + renderContext.getRegionID() + i + ", ");
- }
-
- // regionDD var
- renderContext.getMarkupFragment().append(
- "regionDrop" + renderContext.getRegionID() + ";\n");
-
- renderContext.getMarkupFragment().append(
- " var DDM = YAHOO.util.DDM;\n");
- renderContext.getMarkupFragment().append(
- " DDM.mode = DDM.POINT;\n");
-
- renderContext.getMarkupFragment().append(" return {\n");
- renderContext.getMarkupFragment().append(
- " init: function() {\n");
-
- // write regionDD var declaration
- renderContext.getMarkupFragment().append(
- " regionDrop" + renderContext.getRegionID()
- + " = new YAHOO.util.PortalDD('regionDrop"
- + renderContext.getRegionID() + "');\n");
- renderContext.getMarkupFragment().append(
- " regionDrop" + renderContext.getRegionID()
- + ".setXConstraint(0, 0, 1);\n");
- renderContext.getMarkupFragment().append(
- " regionDrop" + renderContext.getRegionID()
- + ".setYConstraint(0, 0, 1);\n");
-
- for(int i = 0; i < ((Integer) portletPos.get(renderContext.getRegionID())).intValue(); i++)
- {
- // add new DnD objects
-
- renderContext.getMarkupFragment().append(
- " ddPortlet" + renderContext.getRegionID()
- + i
- + " = new YAHOO.util.PortalDD('portlet-dnd-"
- + renderContext.getRegionID() + "-" + i
- + "');\n");
- renderContext.getMarkupFragment()
- .append(
- " ddPortlet"
- + renderContext.getRegionID() + i
- + ".windowId = \"" + (String) windowIds.get("portlet-dnd-" + renderContext.getRegionID() + "-" + i)
- + "\";\n");
- }
-
- // add this regiondrop id
- renderContext.getMarkupFragment().append(
- " ddPortlet" + renderContext.getRegionID() + "0"
- + ".getEl().parentNode.dropToRegion = 'regionDrop"
- + renderContext.getRegionID() + "';\n");
-
- // add this region id
- renderContext.getMarkupFragment().append(
- " ddPortlet" + renderContext.getRegionID() + "0"
- + ".getEl().parentNode.regionId = '"
- + region.getId() + "';\n");
-
- renderContext.getMarkupFragment().append(" }\n");
- renderContext.getMarkupFragment().append(" };\n");
- renderContext.getMarkupFragment().append("} ();\n");
- renderContext.getMarkupFragment().append(
- "YAHOO.util.Event.addListener(window, 'load', YAHOO.example.DDApp"
- + renderContext.getRegionID() + ".init);\n");
- renderContext.getMarkupFragment().append(
- "YAHOO.util.Event.addListener(window, 'load', cleanUpDocument(\"regionDD" + renderContext.getRegionID() + "\"));\n");
-
-
- renderContext.getMarkupFragment().append("</script>\n\n");
-
portletPos.put(renderContext.getRegionID(), new Integer(0));
}
}
@@ -184,7 +94,6 @@
public int getPortletNumber(String regionId)
{
-
int number = 0;
if(portletPos.get(regionId) != null)
{
Deleted: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRendererTools.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRendererTools.java 2006-09-16 05:25:07 UTC (rev 5212)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRendererTools.java 2006-09-16 05:29:00 UTC (rev 5213)
@@ -1,134 +0,0 @@
-/*
-* JBoss, a division of Red Hat
-* 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.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.portal.theme.impl.render.dynamic;
-
-/**
- * Script inserts and debugging tools for client-side javascript
- *
- * @author <a href="mailto:tomasz.szymanski at jboss.com">Tomasz Szymanski</a>
- * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
- */
-
-import org.jboss.logging.Logger;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-public class DynaRendererTools
-{
- private static final Logger log = Logger.getLogger(DynaRendererTools.class);
-
- /**
- * Javascript logger embedded in Footer. Do not move from footer, or IE will crash!
- * TODO: Needs to be a flag in the renderer.
- */
- public static final String DND_FOOTERS = "\n\n\n<script type='text/javascript'>"
- + "var myLogReader1 = new YAHOO.widget.LogReader(null, { newestOnTop: true, height: \"400px\" });"
- + "</script>\n\n"
- + "\n\n\n<style type=\"text/css\">\n"
- + "#yui-log {position:absolute;top:1em;right:1em;font-size:77%;text-align:left; width: 300px}\n"
- + ".yui-log {background-color:#AAA;border:1px solid black;font-family:monospace;z-index:9000;}\n"
- + ".yui-log p {margin:1px;padding:.1em;}\n"
- + ".yui-log button {font-family:monospace;}\n"
- + ".yui-log .yui-log-hd {padding:.5em;background-color:#575757;color:#FFF;}\n"
- + ".yui-log .yui-log-bd {width:100%;height:20em;background-color:#FFF;border:1px solid gray;overflow:auto;}\n"
- + ".yui-log .yui-log-ft {margin-top:.5em;margin-bottom:1em;}\n"
- + ".yui-log .yui-log-ft .yui-log-categoryfilters {}\n"
- + ".yui-log .yui-log-ft .yui-log-sourcefilters {width:100%;border-top:1px solid #575757;margin-top:.75em;padding-top:.75em;}\n"
- + ".yui-log .yui-log-btns {position:relative;float:right;bottom:.25em;}\n"
- + ".yui-log .yui-log-filtergrp {margin-right:.5em;}\n"
- + ".yui-log .info {background-color:#A7CC25;} \n"
- + ".yui-log .warn {background-color:#F58516;}\n"
- + ".yui-log .error {background-color:#E32F0B;} \n"
- + ".yui-log .time {background-color:#A6C9D7;} \n"
- + ".yui-log .window {background-color:#F2E886;} \n"
- + "</style>\n\n";
-
- /**
- * Returns script tag markup for DnD
- public static final String getScriptHeaders(String ctx)
- {
-
- ctx = "/portal-ajax";
-
- StringBuffer sb = new StringBuffer();
- sb.append("\n\n\n");
- sb.append("<script type='text/javascript' src='").append(ctx).append("/js/yahoo/yahoo.js'></script>\n");
- sb.append("<script type='text/javascript' src='").append(ctx).append("/js/event/event.js'></script>\n");
- sb.append("<script type='text/javascript' src='").append(ctx).append("/js/dom/dom.js'></script>\n");
- sb.append("<script type='text/javascript' src='").append(ctx).append("/js/logger/logger.js'></script>\n");
- sb.append("<script type='text/javascript' src='").append(ctx).append("/js/dragdrop/dragdrop-debug.js'></script>\n");
- sb.append("<script type='text/javascript' src='").append(ctx).append("/js/connection/connection.js'></script>\n");
- sb.append("<script type='text/javascript' src='").append(ctx).append("/js/portal/PortalDD.js'></script>");
- sb.append("\n\n\n");
- return sb.toString();
- }
- */
-
- /**
- * @deprecated
- */
- public static Class getRendererClass(String className) throws ClassNotFoundException
- {
- Properties props = new Properties();
-
- InputStream is = DynaRendererTools.class.getResourceAsStream(DND_PROP_FILENAME);
- try
- {
- props.load(is);
-
- Class clas = Thread.currentThread().getContextClassLoader().loadClass(props.getProperty(className));
- return clas;
- }
- catch(IOException e)
- {
- log.error(e);
- throw new ClassNotFoundException(e.getMessage());
- }
- }
-
- /**
- * @deprecated
- */
- public static final String DECOR_CLASS = "decorationRenderer.class";
-
- /**
- * @deprecated
- */
- public static final String PORLTET_CLASS = "portletRenderer.class";
-
- /**
- * @deprecated
- */
- public static final String REGION_CLASS = "regionRenderer.class";
-
- /**
- * @deprecated
- */
- public static final String WINDOW_CLASS = "windowRenderer.class";
-
- /**
- * @deprecated
- */
- public static final String DND_PROP_FILENAME = "/dnd.properties";
-}
Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java 2006-09-16 05:25:07 UTC (rev 5212)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java 2006-09-16 05:29:00 UTC (rev 5213)
@@ -23,7 +23,6 @@
package org.jboss.portal.theme.impl.render.dynamic;
import org.jboss.logging.Logger;
-import org.jboss.portal.theme.impl.render.div.DivWindowRenderer;
import org.jboss.portal.theme.page.WindowContext;
import org.jboss.portal.theme.page.WindowResult;
import org.jboss.portal.theme.render.RenderContext;
@@ -45,10 +44,9 @@
private WindowRenderer delegate;
public DynaWindowRenderer(WindowRenderer windowRenderer) throws InstantiationException,
- IllegalAccessException, ClassNotFoundException
+ IllegalAccessException, ClassNotFoundException
{
super();
- //delegate = (WindowRenderer) DynaRendererTools.getRendererClass(DynaRendererTools.WINDOW_CLASS).newInstance();
delegate = windowRenderer;
}
@@ -67,14 +65,11 @@
"portlet-dnd-" + renderContext.getRegionID() + "-"
+ portletNumber, portletContext.getWindowName());
- if(portletNumber == 0)
+ // TODO: Find a way for CSS to control the forced empty width of the region div!
+ if(portletNumber == 0 && !"navigation".equalsIgnoreCase(renderContext.getRegionID()))
{
- renderContext
- .getMarkupFragment()
- .append(
- "<div style='display: none; visibility: hidden; padding: 50px; margin: 10px; border: 1px dashed black;' id='regionDrop"
- + renderContext.getRegionID()
- + "'>Drop your portlets here</div>");
+ // force space to maintain region width, even when it empty of windows.
+ renderContext.getMarkupFragment().append(" ");
}
renderContext.getMarkupFragment().append(
Added: trunk/theme/src/main/org/jboss/portal/theme/render/region/AJAXFooter.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/render/region/AJAXFooter.java 2006-09-16 05:25:07 UTC (rev 5212)
+++ trunk/theme/src/main/org/jboss/portal/theme/render/region/AJAXFooter.java 2006-09-16 05:29:00 UTC (rev 5213)
@@ -0,0 +1,45 @@
+/*
+* JBoss, a division of Red Hat
+* 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.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.jboss.portal.theme.render.region;
+
+/**
+ * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
+ */
+
+public class AJAXFooter
+{
+ /**
+ * Returns output for rendering in region tag.
+ *
+ * @param s
+ * @return output for rendering
+ */
+ public String render(String s)
+ {
+ String ctx = "/portal-ajax";
+
+ StringBuffer sb = new StringBuffer();
+ sb.append("\n\n<script type='text/javascript' src='").append(ctx).append("/js/portal/event.js'></script>\n\n");
+ return sb.toString();
+ }
+}
Modified: trunk/theme/src/main/org/jboss/portal/theme/render/region/AJAXScripts.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/render/region/AJAXScripts.java 2006-09-16 05:25:07 UTC (rev 5212)
+++ trunk/theme/src/main/org/jboss/portal/theme/render/region/AJAXScripts.java 2006-09-16 05:29:00 UTC (rev 5213)
@@ -42,13 +42,16 @@
StringBuffer sb = new StringBuffer();
sb.append("\n\n\n");
- sb.append("<script type='text/javascript' src='").append(ctx).append("/js/yahoo/yahoo.js'></script>\n");
- sb.append("<script type='text/javascript' src='").append(ctx).append("/js/event/event.js'></script>\n");
- sb.append("<script type='text/javascript' src='").append(ctx).append("/js/dom/dom.js'></script>\n");
- sb.append("<script type='text/javascript' src='").append(ctx).append("/js/logger/logger.js'></script>\n");
- sb.append("<script type='text/javascript' src='").append(ctx).append("/js/dragdrop/dragdrop-debug.js'></script>\n");
- sb.append("<script type='text/javascript' src='").append(ctx).append("/js/connection/connection.js'></script>\n");
- sb.append("<script type='text/javascript' src='").append(ctx).append("/js/portal/PortalDD.js'></script>");
+
+ // TODO: remove unecessary libs
+ sb.append("<script type='text/javascript' src='").append(ctx).append("/js/portal/prototype.js'></script>\n");
+ sb.append("<script type='text/javascript' src='").append(ctx).append("/js/portal/scriptaculous.js'></script>\n");
+ sb.append("<script type='text/javascript' src='").append(ctx).append("/js/portal/effects.js'></script>\n");
+ sb.append("<script type='text/javascript' src='").append(ctx).append("/js/portal/builder.js'></script>\n");
+ sb.append("<script type='text/javascript' src='").append(ctx).append("/js/portal/controls.js'></script>\n");
+ sb.append("<script type='text/javascript' src='").append(ctx).append("/js/portal/slider.js'></script>\n");
+ sb.append("<script type='text/javascript' src='").append(ctx).append("/js/portal/dragdrop.js'></script>\n");
+// sb.append("<script type='text/javascript' src='").append(ctx).append("/js/portal/unittest.js'></script>\n");
sb.append("\n\n\n");
return sb.toString();
More information about the jboss-svn-commits
mailing list