You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by sh...@apache.org on 2005/12/16 00:26:16 UTC
svn commit: r357089 - in /portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1:
components/portal/src/java/org/apache/jetspeed/aggregator/impl/
src/webapp/WEB-INF/ src/webapp/decorations/layout/jetspeed/
src/webapp/decorations/layout/jscookmenu/ src/webap...
Author: shinsuke
Date: Thu Dec 15 15:26:07 2005
New Revision: 357089
URL: http://svn.apache.org/viewcvs?rev=357089&view=rev
Log:
HeaderResource component does not work. fixed
Modified:
portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/components/portal/src/java/org/apache/jetspeed/aggregator/impl/ContentServerAdapterImpl.java
portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorImpl.java
portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/jetspeed_macros.vm
portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/jetspeed/header.vm
portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/jscookmenu/header.vm
portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/simple/header.vm
portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/simple/xhtml-basic/header.vm
portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/tigris/header.vm
Modified: portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/components/portal/src/java/org/apache/jetspeed/aggregator/impl/ContentServerAdapterImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/components/portal/src/java/org/apache/jetspeed/aggregator/impl/ContentServerAdapterImpl.java?rev=357089&r1=357088&r2=357089&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/components/portal/src/java/org/apache/jetspeed/aggregator/impl/ContentServerAdapterImpl.java (original)
+++ portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/components/portal/src/java/org/apache/jetspeed/aggregator/impl/ContentServerAdapterImpl.java Thu Dec 15 15:26:07 2005
@@ -105,6 +105,7 @@
String decoratorType )
{
// TODO: is this factory necessary or can we assemble header resource with Spring
+/*
HeaderResource headerResource = headerResourceFactory.getHeaderResouce(context);
if (decoratorType.equals(ContentFragment.LAYOUT))
@@ -115,5 +116,6 @@
{
headerResource.addStyleSheet("content/" + decoratorName + "/css/styles.css");
}
+*/
}
}
Modified: portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorImpl.java?rev=357089&r1=357088&r2=357089&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorImpl.java (original)
+++ portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorImpl.java Thu Dec 15 15:26:07 2005
@@ -96,6 +96,7 @@
private void addStyle(RequestContext context, String decoratorName, String decoratorType)
{
log.debug("addStyle: decoratorName=" + decoratorName + ", decoratorType=" + decoratorType );
+/*
HeaderResourceFactory headerResourceFactory=(HeaderResourceFactory)Jetspeed.getComponentManager().getComponent(HeaderResourceFactory.class);
HeaderResource headerResource=headerResourceFactory.getHeaderResouce(context);
@@ -107,5 +108,6 @@
{
headerResource.addStyleSheet("content/"+decoratorName+"/css/styles.css");
}
+*/
}
}
Modified: portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/jetspeed_macros.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/jetspeed_macros.vm?rev=357089&r1=357088&r2=357089&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/jetspeed_macros.vm (original)
+++ portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/WEB-INF/jetspeed_macros.vm Thu Dec 15 15:26:07 2005
@@ -64,6 +64,13 @@
#end
#end
+#* Adds additional style sheets and java script from portlet *#
+#macro (includeHeaderResource)
+ #set($resourceHeaderFactory = $jetspeed.getComponent("org.apache.jetspeed.headerresource.HeaderResourceFactory"))
+ #set($resourceHeader = $resourceHeaderFactory.getHeaderResouce($JS2RequestContext))
+ $resourceHeader
+#end
+
#*
* Returns the base CSS class to use in top level tags
*#
@@ -171,4 +178,4 @@
<span class="separator"></span>
#end
</div>
-#end
\ No newline at end of file
+#end
Modified: portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/jetspeed/header.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/jetspeed/header.vm?rev=357089&r1=357088&r2=357089&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/jetspeed/header.vm (original)
+++ portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/jetspeed/header.vm Thu Dec 15 15:26:07 2005
@@ -28,6 +28,7 @@
<title>#PageTitle()</title>
#includeJavaScriptForHead()
#IncludeStylesheets()
+#includeHeaderResource()
</head>
<body class="#PageBaseCSSClass()">
<!-- BEGIN: layout/html/jetspeed/decorator.vm -->
Modified: portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/jscookmenu/header.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/jscookmenu/header.vm?rev=357089&r1=357088&r2=357089&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/jscookmenu/header.vm (original)
+++ portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/jscookmenu/header.vm Thu Dec 15 15:26:07 2005
@@ -64,8 +64,8 @@
<meta http-equiv="Content-style-type" content="text/css" />
#includeJavaScriptForHead()
-## #includeHeaderResource()
#IncludeStylesheets()
+#includeHeaderResource()
<title>#PageTitle()</title>
<meta name="version" content="/* $Id: decorator-top.vm 239262 2005-08-22 22:23:39Z shinsuke $" />
Modified: portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/simple/header.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/simple/header.vm?rev=357089&r1=357088&r2=357089&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/simple/header.vm (original)
+++ portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/simple/header.vm Thu Dec 15 15:26:07 2005
@@ -31,6 +31,7 @@
<meta http-equiv="Content-style-type" content="text/css" />
#includeJavaScriptForHead()
#IncludeStylesheets()
+#includeHeaderResource()
<title>#PageTitle()</title>
<meta name="version" content="#SiteVersionTag()" />
Modified: portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/simple/xhtml-basic/header.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/simple/xhtml-basic/header.vm?rev=357089&r1=357088&r2=357089&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/simple/xhtml-basic/header.vm (original)
+++ portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/simple/xhtml-basic/header.vm Thu Dec 15 15:26:07 2005
@@ -19,6 +19,7 @@
<head>
<meta http-equiv="Content-Type" content="$response.contentType"/>
#IncludeStylesheets()
+#includeHeaderResource()
<title>#PageTitle()</title>
</head>
<body>
Modified: portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/tigris/header.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/tigris/header.vm?rev=357089&r1=357088&r2=357089&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/tigris/header.vm (original)
+++ portals/jetspeed-2/branches/JETSPEED-BRANCH-2.0.1/src/webapp/decorations/layout/tigris/header.vm Thu Dec 15 15:26:07 2005
@@ -32,6 +32,8 @@
#IncludeStylesheets()
+ #includeHeaderResource()
+
<title>#PageTitle()</title>
<meta name="version" content="#SiteVersionTag()">
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org