Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r3999 - in labs/jbosslabs/trunk/portal-extensions: forge-theme forge-theme/src/java/org/jboss/portal/core/theme/render/impl jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess portal-default/src/web/WEB-INF
Author: szimano
Date: 2006-04-27 17:31:33 -0400 (Thu, 27 Apr 2006)
New Revision: 3999
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-theme/maven.xml
labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFDecorationRenderer.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
Log:
added ability to show windowstate control buttons (just simple text hrefs)
JBLAB-667
Modified: labs/jbosslabs/trunk/portal-extensions/forge-theme/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-theme/maven.xml 2006-04-27 19:41:56 UTC (rev 3998)
+++ labs/jbosslabs/trunk/portal-extensions/forge-theme/maven.xml 2006-04-27 21:31:33 UTC (rev 3999)
@@ -27,7 +27,7 @@
</goal>
<goal name="deploy">
- <ant:copy todir="../${forge.sar.dir}/target" overwrite="true">
+ <ant:copy todir="${local.deploy.dir}" overwrite="true">
<ant:fileset dir=".">
<ant:include name="jbossForgeLayout.war/**" />
</ant:fileset>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFDecorationRenderer.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFDecorationRenderer.java 2006-04-27 19:41:56 UTC (rev 3998)
+++ labs/jbosslabs/trunk/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFDecorationRenderer.java 2006-04-27 21:31:33 UTC (rev 3999)
@@ -13,6 +13,7 @@
import java.util.Iterator;
import org.jboss.logging.Logger;
+import org.jboss.portal.theme.ThemeException;
import org.jboss.portal.theme.page.PortletContext;
import org.jboss.portal.theme.page.WindowResult;
import org.jboss.portal.theme.render.DecorationRenderer;
@@ -21,68 +22,77 @@
/**
* @author <a href="mailto:tom...@jb...">Tomasz Szymanski</a>
- *
+ *
*/
-public class JBFDecorationRenderer
- implements DecorationRenderer
-{
+public class JBFDecorationRenderer implements DecorationRenderer {
+ private static final Object SHOW_DECORATION_PORPERTY = "decorationVisible";
+
private static Logger log = Logger.getLogger(JBFDecorationRenderer.class);
-
+
/**
- * @see org.jboss.portal.theme.render.Renderer#renderStart
- */
- public void renderStart(RenderContext ctx)
- {
- }
+ * @see org.jboss.portal.theme.render.Renderer#renderStart
+ */
+ public void renderStart(RenderContext ctx) {
+ }
- /**
- * @see org.jboss.portal.theme.render.Renderer#renderEnd
- */
- public void renderEnd(RenderContext ctx)
- {
- }
+ /**
+ * @see org.jboss.portal.theme.render.Renderer#renderEnd
+ */
+ public void renderEnd(RenderContext ctx) {
+ }
- /**
- * @see DecorationRenderer#render
- */
- public void render(RenderContext renderContext, PortletContext portletContext, WindowResult result)
- throws RenderException
- {
- /*log.debug("decorate " + result.getTitle());
+ /**
+ * @see DecorationRenderer#render
+ */
+ public void render(RenderContext renderContext,
+ PortletContext portletContext, WindowResult result)
+ throws RenderException {
+
+ if (result.getWindowProperties().get(SHOW_DECORATION_PORPERTY) != null
+ && result.getWindowProperties().get(
+ SHOW_DECORATION_PORPERTY).equals("true")) {
+ log.debug("decorate " + result.getTitle());
- StringBuffer markup = renderContext.getMarkupFragment();
- markup.append("<tr><td class=\"portlet-titlebar-left\"></td>");
- markup.append("<td class=\"portlet-titlebar-center\">");
- //renderTitle(renderContext, result);
- markup.append("<div class=\"portlet-mode-container\">");
- renderModeAndStateLinks(renderContext, result, "mode");
- renderModeAndStateLinks(renderContext, result, "windowstate");
+ //StringBuffer markup = renderContext.getMarkupFragment();
+ //markup.append("<tr><td class=\"portlet-titlebar-left\"></td>");
+ //markup.append("<td class=\"portlet-titlebar-center\">");
+ // renderTitle(renderContext, result);
+ //markup.append("<div class=\"portlet-mode-container\">");
+ renderModeAndStateLinks(renderContext, result, "mode", portletContext);
+ renderModeAndStateLinks(renderContext, result, "windowstate", portletContext);
- markup.append("</div></td><td class=\"portlet-titlebar-right\"></td></tr>");
-
- log.debug("decoration is done");*/
- }
+ //markup
+ // .append("</div></td><td class=\"portlet-titlebar-right\"></td></tr>");
- private static void renderTitle(RenderContext ctx, WindowResult result)
- {
- ctx.getMarkupFragment().append("<div class=\"portlet-titlebar-decoration\">");
- ctx.getMarkupFragment().append("<span class=\"portlet-titlebar-title\">");
- ctx.getMarkupFragment().append(result.getTitle());
- ctx.getMarkupFragment().append("</span></div>");
- }
+ log.debug("decoration is done");
+ }
+ }
- private static void renderModeAndStateLinks(RenderContext ctx, WindowResult result, String selector)
- {
- log.debug("render modes and states");
- Collection modes = result.getTriggerableActions(selector);
- for (Iterator i=modes.iterator(); i.hasNext(); ){
- WindowResult.Action action = (WindowResult.Action)i.next();
- if (action.isEnabled()){
- log.debug("action is enabled: " + action.getName());
- ctx.getMarkupFragment().append("<div class=\"portlet-mode-").append(action.getName());
- ctx.getMarkupFragment().append("\" onClick=\"location.href='").append(action.getURL()).append("';\"></div>");
- }
- }
- }
+ private static void renderTitle(RenderContext ctx, WindowResult result) {
+ ctx.getMarkupFragment().append(
+ "<div class=\"portlet-titlebar-decoration\">");
+ ctx.getMarkupFragment().append(
+ "<span class=\"portlet-titlebar-title\">");
+ ctx.getMarkupFragment().append(result.getTitle());
+ ctx.getMarkupFragment().append("</span></div>");
+ }
+
+ private static void renderModeAndStateLinks(RenderContext ctx,
+ WindowResult result, String selector, PortletContext portletContext) {
+ log.debug("render modes and states");
+ Collection modes = result.getTriggerableActions(selector);
+ for (Iterator i = modes.iterator(); i.hasNext();) {
+ WindowResult.Action action = (WindowResult.Action) i.next();
+
+ if (action.isEnabled()) {
+ log.debug("action is enabled: " + action.getName());
+ ctx.getMarkupFragment().append("<a class=\"portlet-mode-")
+ .append(action.getName());
+ ctx.getMarkupFragment().append("\" href=\"")
+ .append(action.getURL()).append("\">").append(
+ action.getName()).append("</a> ");
+ }
+ }
+ }
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2006-04-27 19:41:56 UTC (rev 3998)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2006-04-27 21:31:33 UTC (rev 3999)
@@ -55,8 +55,6 @@
import org.jboss.wiki.exceptions.WikiManagementNotFoundException;
import org.jboss.wiki.management.WikiServiceMenagement;
-// import org.jboss.forge.common.content.ContentManager;
-// import org.jboss.forge.common.ForgeHelper;
/**
* A filter that enables to download files form the jspwiki structure +
Modified: labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml 2006-04-27 19:41:56 UTC (rev 3998)
+++ labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml 2006-04-27 21:31:33 UTC (rev 3999)
@@ -570,18 +570,36 @@
<instance-ref>RolePortletInstance</instance-ref>
<region>center</region>
<height>2</height>
+ <properties>
+ <property>
+ <name>decorationVisible</name>
+ <value>true</value>
+ </property>
+ </properties>
</window>
<window>
<window-name>UserPortletWindowDefaultAdmin</window-name>
<instance-ref>UserPortletInstance</instance-ref>
<region>center</region>
<height>0</height>
+ <properties>
+ <property>
+ <name>decorationVisible</name>
+ <value>true</value>
+ </property>
+ </properties>
</window>
<window>
<window-name>ManagementPortletWindowDefaultAdmin</window-name>
<instance-ref>ManagementPortletInstance</instance-ref>
<region>center</region>
<height>1</height>
+ <properties>
+ <property>
+ <name>decorationVisible</name>
+ <value>true</value>
+ </property>
+ </properties>
</window>
<security-constraint>
<policy-permission>
|
