Author: smilek
Date: Wed Feb 21 13:28:09 2007
New Revision: 510235
URL: http://svn.apache.org/viewvc?view=rev&rev=510235
Log:
added arguments to JetspeedDesktop bean ctor (desktop.xml); added jetspeed
desktop layout and portlet decoration defaults to headtag.xml
Modified:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/desktop.xml
portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/headtag.xml
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/desktop.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/desktop.xml?view=diff&rev=510235&r1=510234&r2=510235
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/desktop.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/desktop.xml Wed Feb 21
13:28:09 2007
@@ -24,21 +24,29 @@
<bean id="JetspeedDesktop"
class="org.apache.jetspeed.desktop.impl.JetspeedDesktopImpl">
<!-- Location of the desktop themes -->
- <constructor-arg index="0">
- <value>/desktop-themes/</value>
+ <constructor-arg index='0'>
+ <ref bean="DecorationFactory"/>
</constructor-arg>
- <!-- Default Theme (if not specified in page) -->
<constructor-arg index="1">
- <value>blue</value>
+ <ref
bean="org.apache.jetspeed.headerresource.HeaderResourceFactory" />
</constructor-arg>
- <!-- Default Theme file extension -->
- <constructor-arg index="2">
+ <constructor-arg index="2"> <!-- desktop servlet path -->
+ <value>/desktop</value>
+ </constructor-arg>
+ <constructor-arg index="3"> <!-- default desktop layout extension -->
<value>.jsp</value>
</constructor-arg>
- <constructor-arg index="3">
- <ref
bean="org.apache.jetspeed.headerresource.HeaderResourceFactory" />
+ <!-- Optional decoration defaults for desktop - bean id
'DesktopConfiguration' (in headtag.xml)
+ supports the settings 'desktop.decoration.layout' and
'desktop.decoration.portlet', which if
+ specified, override the values set here -->
+ <constructor-arg index="4"> <!-- default desktop layout decoration
-->
+ <value>tigris</value>
+ </constructor-arg>
+ <constructor-arg index="5"> <!-- default desktop portlet decoration
-->
+ <value>tigris</value>
</constructor-arg>
- <!-- Uncomment this to HARD CODE your portal URL -->
+
+ <!-- Uncomment this to HARD CODE your portal URL -->
<!-- <constructor-arg><ref bean="BasePortalURL"/></constructor-arg>
-->
</bean>
</beans>
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/headtag.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/headtag.xml?view=diff&rev=510235&r1=510234&r2=510235
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/headtag.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/headtag.xml Wed Feb 21
13:28:09 2007
@@ -43,7 +43,7 @@
<value>header.dojo.modules.namespace</value> <!--
dojo.registerNamespace statements -->
<value>header.dojo.style.bodyexpand</value> <!--
css for body 100% height/width (for some dojo widgets) -->
<value>header.basetag</value> <!--
generated <base href=".../jetspeed/"> -->
- <value>header.desktop.style.desktoptheme</value> <!--
generated <link href=".../styles.css"> for desktop-theme -->
+ <value>header.desktop.style.layout</value> <!--
generated <link href=".../styles.css"> for layout decoration -->
<value>header.desktop.init</value> <!--
generated desktop startup javascript -->
</list>
</entry>
@@ -57,6 +57,20 @@
<bean id="DesktopConfiguration" class="java.util.HashMap">
<constructor-arg index="0">
<map>
+ <!-- layout and portlet decorations -->
+ <entry key="desktop.decoration.layout">
+ <!-- default layout decoration for desktop
+ this is used when a selected layout decoration does
not support desktop -->
+ <value>tigris</value>
+ </entry>
+
+ <entry key="desktop.decoration.portlet">
+ <!-- default portlet decoration for desktop
+ this is used when a selected portlet decoration does
not support desktop -->
+ <value>tigris</value>
+ </entry>
+
+ <!-- window modes -->
<entry key="desktop.window.tiling">
<!-- enable window tiling mode - default is true -->
<value>true</value>
@@ -65,6 +79,8 @@
<!-- default tiled windows to expand in height to fit
content - default is false -->
<value>true</value>
</entry>
+
+ <!-- window dimensions -->
<entry key="desktop.window.height">
<!-- default window height -->
<value>200</value>
@@ -74,19 +90,6 @@
<value>280</value>
</entry>
- <!-- window themes -->
- <entry key="desktop.window.theme">
- <!-- default desktop window theme -->
- <value>tigris</value>
- </entry>
- <entry key="desktop.window.theme.allowed">
- <!-- list of allowed desktop window themes -->
- <list>
- <value>tigris</value>
- <value>blueocean</value>
- </list>
- </entry>
-
<!-- window actions -->
<!-- NOTE: each window theme may override any of these
properties in its windowtheme.js file -->
<entry key="desktop.window.action.button.order">
@@ -317,11 +320,11 @@
</entry>
<entry key="dojo.parameter.isDebug">
<!-- value for djConfig variable isDebug -->
- <value>true</value>
+ <value>false</value>
</entry>
<entry key="dojo.parameter.debugAtAllCosts">
<!-- value for djConfig variable debugAtAllCosts -->
- <value>true</value>
+ <value>false</value>
</entry>
<entry key="dojo.parameters">
<!-- additional djConfig variables expressed as a json
object fragment: -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
