You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by mr...@apache.org on 2006/04/14 03:02:48 UTC
svn commit: r393993 - in /incubator/webwork2/action/src/main/resources: ./
org/apache/struts/action2/static/dojo/struts/
org/apache/struts/action2/static/tooltip/ template/simple/ template/xhtml/
Author: mrdon
Date: Thu Apr 13 18:02:44 2006
New Revision: 393993
URL: http://svn.apache.org/viewcvs?rev=393993&view=rev
Log:
Replacing the old tooltip lib with dojo...Still need to resolve duplicate
tooltip problem (alt tag by the browser) and prune Component code
Added:
incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/tooltip.gif (with props)
Removed:
incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/tooltip/
Modified:
incubator/webwork2/action/src/main/resources/struts-default.xml
incubator/webwork2/action/src/main/resources/template/simple/form-close.ftl
incubator/webwork2/action/src/main/resources/template/xhtml/checkbox.ftl
incubator/webwork2/action/src/main/resources/template/xhtml/tooltip.ftl
Added: incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/tooltip.gif
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/tooltip.gif?rev=393993&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/webwork2/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/tooltip.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/webwork2/action/src/main/resources/struts-default.xml
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/struts-default.xml?rev=393993&r1=393992&r2=393993&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/struts-default.xml (original)
+++ incubator/webwork2/action/src/main/resources/struts-default.xml Thu Apr 13 18:02:44 2006
@@ -2,6 +2,7 @@
<xwork>
<package name="struts-default">
<result-types>
+ <result-type name="jasper" class="org.apache.struts.action2.views.jasperreports.JasperReportsResult"/>
<result-type name="chain" class="com.opensymphony.xwork.ActionChainResult"/>
<result-type name="dispatcher" class="org.apache.struts.action2.dispatcher.ServletDispatcherResult" default="true"/>
<result-type name="freemarker" class="org.apache.struts.action2.views.freemarker.FreemarkerResult"/>
@@ -21,7 +22,7 @@
<result-type name="richtexteditorFileUpload" class="org.apache.struts.action2.views.jsp.ui.RichtexteditorFileUploadResult" />
<!-- third party integration -->
- <result-type name="jasper" class="org.apache.struts.action2.views.jasperreports.JasperReportsResult"/>
+
</result-types>
<interceptors>
Modified: incubator/webwork2/action/src/main/resources/template/simple/form-close.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/simple/form-close.ftl?rev=393993&r1=393992&r2=393993&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/simple/form-close.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/simple/form-close.ftl Thu Apr 13 18:02:44 2006
@@ -57,7 +57,5 @@
<#--
Code that will add javascript needed for tooltips
--><#t/>
-<#if parameters.hasTooltip?default(false)><#t/>
<#lt/><!-- javascript that is needed for tooltips -->
- <#lt/><script language="JavaScript" type="text/javascript" src="<@saf.url value='/struts/tooltip/wz_tooltip.js' encode='false' />"></script>
-</#if><#t/>
+ <#lt/><script language="JavaScript" type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script>
Modified: incubator/webwork2/action/src/main/resources/template/xhtml/checkbox.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/xhtml/checkbox.ftl?rev=393993&r1=393992&r2=393993&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/xhtml/checkbox.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/xhtml/checkbox.ftl Thu Apr 13 18:02:44 2006
@@ -34,7 +34,7 @@
</#if>
:<#t/>
<#if parameters.tooltip?exists>
- <img src='<@saf.url value="/struts/tooltip/tooltip.gif" />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
+ <#include "/${parameters.templateDir}/xhtml/tooltip.ftl" />
</#if>
</label><#t/>
</#if>
Modified: incubator/webwork2/action/src/main/resources/template/xhtml/tooltip.ftl
URL: http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/resources/template/xhtml/tooltip.ftl?rev=393993&r1=393992&r2=393993&view=diff
==============================================================================
--- incubator/webwork2/action/src/main/resources/template/xhtml/tooltip.ftl (original)
+++ incubator/webwork2/action/src/main/resources/template/xhtml/tooltip.ftl Thu Apr 13 18:02:44 2006
@@ -1,87 +1,22 @@
<#if parameters.tooltip?exists><#t/>
- <img
+ <img id="_tt${parameters.tooltip.hashCode()}"
<#if parameters.tooltipIcon?exists><#t/>
src='<@saf.url value="${parameters.tooltipIcon}" />'
<#else><#t/>
- src='<@saf.url value="/struts/tooltip/tooltip.gif" />'
+ src='<@saf.url value="/struts/dojo/struts/tooltip.gif" />'
</#if><#t/>
alt="${parameters.tooltip?html}"
- title="${parameters.tooltip?html}"
- onmouseover="<#rt/>
- <#if parameters.tooltipAboveMousePointer?exists><#t/>
- <#t/>this.T_ABOVE=${parameters.tooltipAboveMousePointer};<#t/>
- </#if><#t/>
- <#if parameters.tooltipBgColor?exists><#t/>
- <#t/>this.T_BGCOLOR='${parameters.tooltipBgColor}';<#t/>
- </#if><#t/>
- <#if parameters.tooltipBgImg?exists><#t/>
- <#t/>this.T_BGIMG='<@saf.url value="${parameters.tooltipBgImg}" />';<#t/>
- </#if><#t/>
- <#if parameters.tooltipBorderWidth?exists><#t/>
- <#t/>this.T_BORDERWIDTH=${parameters.tooltipBorderWidth};<#t/>
- </#if><#t/>
- <#if parameters.tooltipBorderColor?exists><#t/>
- <#t/>this.T_BORDERCOLOR='${parameters.tooltipBorderColor}';<#t/>
- </#if><#t/>
- <#if parameters.tooltipDelay?exists><#t/>
- <#t/>this.T_DELAY=${parameters.tooltipDelay};<#t/>
- </#if><#t/>
- <#if parameters.tooltipFixCoordinateX?exists && parameters.tooltipFixCoordinateY?exists><#t/>
- <#t/>this.T_FIX=[${parameters.tooltipFixCoordinateX}, ${parameters.tooltipFixCoordinateY}];<#t/>
- </#if><#t/>
- <#if parameters.tooltipFontColor?exists><#t/>
- <#t/>this.T_FONTCOLOR='${parameters.tooltipFontColor}';<#t/>
- </#if><#t/>
- <#if parameters.tooltipFontFace?exists><#t/>
- <#t/>this.T_FONTFACE='${parameters.tooltipFontFace}';<#t/>
- </#if><#t/>
- <#if parameters.tooltipFontSize?exists><#t/>
- <#t/>this.T_FONTSIZE='${parameters.tooltipFontSize}';<#t/>
- </#if><#t/>
- <#if parameters.tooltipFontWeight?exists><#t/>
- <#t/>this.T_FONTWEIGHT='${parameters.tooltipFontWeight}';<#t/>
- </#if><#t/>
- <#if parameters.tooltipLeftOfMousePointer?exists><#t/><#t/>
- <#t/>this.T_LEFT=${parameters.tooltipLeftOfMousePointer};<#t/>
- </#if><#t/>
- <#if parameters.tooltipOffsetX?exists><#t/>
- <#t/>this.T_OFFSETX=${parameters.tooltipOffsetX};<#t/>
- </#if><#t/>
- <#if parameters.tooltipOffsetY?exists><#t/>
- <#t/>this.T_OFFSETY=${parameters.tooltipOffsetY};<#t/>
- </#if><#t/>
- <#if parameters.tooltipOpacity?exists><#t/>
- <#t/>this.T_OPACITY=${parameters.tooltipOpacity};<#t/>
- </#if><#t/>
- <#if parameters.tooltipPadding?exists><#t/>
- <#t/>this.T_PADDING=${parameters.tooltipPadding};<#t/>
- </#if><#t/>
- <#if parameters.tooltipShadowColor?exists><#t/>
- <#t/>this.T_SHADOWCOLOR='${parameters.tooltipShadowColor}';<#t/>
- </#if><#t/>
- <#if parameters.tooltipShadowWidth?exists><#t/>
- <#t/>this.T_SHADOWWIDTH=${parameters.tooltipShadowWidth};<#t/>
- </#if><#t/>
- <#if parameters.tooltipStatic?exists><#t/>
- <#t/>this.T_STATIC=${parameters.tooltipStatic};<#t/>
- </#if><#t/>
- <#if parameters.tooltipSticky?exists>
- <#t/>this.T_STICKY=${parameters.tooltipSticky};<#t/>
- </#if><#t/>
- <#if parameters.tooltipStayAppearTime?exists><#t/>
- <#t/>this.T_TEMP=${parameters.tooltipStayAppearTime};<#t/>
- </#if><#t/>
- <#if parameters.tooltipTextAlign?exists><#t/>
- <#t/>this.T_TEXTALIGN='${parameters.tooltipTextAlign}';<#t/>
- </#if><#t/>
- <#if parameters.tooltipTitle?exists><#t/>
- <#t/>this.T_TITLE='${parameters.tooltipTitle?js_string}';<#t/>
- </#if><#t/>
- <#if parameters.tooltipTitleColor?exists><#t/>
- <#t/>this.T_TITLECOLOR='${parameters.tooltipTitleColor}';<#t/>
- </#if><#t/>
- <#if parameters.tooltipWidth?exists><#t/>
- <#t/>this.T_WIDTH=${parameters.tooltipWidth};<#t/>
- </#if><#t/>
- <#t/>return escape('${parameters.tooltip?js_string}');" />
+ title="${parameters.tooltip?html}" />
+
+ <span dojoType="tooltip" connectId="_tt${parameters.tooltip.hashCode()}"
+ <#if parameters.tooltipToggle?exists><#t/>
+ <#t/>toggle="${parameters.tooltipToggle}"<#t/>
+ </#if><#t/>
+ <#if parameters.tooltipToggleDuration?exists><#t/>
+ <#t/>toggleDuration="${parameters.tooltipToggleDuration}"<#t/>
+ </#if><#t/>
+ <#if parameters.tooltipDelay?exists><#t/>
+ <#t/>delay="${parameters.tooltipDelay}"<#t/>
+ </#if><#t/>
+ caption="${parameters.tooltip}"></span>
</#if><#t/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org