Commits

Anonymous committed f20981f

Related to WW-1322 I found more missing includeParams attributes
o added missing includeParams='none' to all css/js <@ww:url... /> occurances
o fixed showcase decorator
Issue Number: WW-1322

git-svn-id: http://svn.opensymphony.com/svn/webwork/trunk@2650573baa09-0c28-0410-bef9-dab3c582ae83

Comments (0)

Files changed (4)

src/java/template/simple/richtexteditor.ftl

 	<#if parameters.basePath?exists><#t/>
 		oFCKeditor_${parameters.id}.BasePath = '${parameters.basePath}' ;
 	<#else><#t/>
-		oFCKeditor_${parameters.id}.BasePath = '<@ww.url value="/webwork/richtexteditor/" />' ;
+		oFCKeditor_${parameters.id}.BasePath = '<@ww.url value="/webwork/richtexteditor/" encode="false" includeParams="none"/>' ;
 	</#if><#t/>
 	<#-- height --><#t/>
 	<#if parameters.height?exists><#t/>

src/java/template/xhtml/checkbox.ftl

 </#if>
 :<#t/>
 <#if parameters.tooltip?exists>
-    <img src='<@ww.url value="/webwork/tooltip/tooltip.gif" includeParams='none' />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
+    <img src='<@ww.url value="/webwork/tooltip/tooltip.gif" encode='false' includeParams='none' />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
 </#if>
 </label><#t/>
 </#if>
 </#if>
 :<#t/>
 <#if parameters.tooltip?exists>
-    <img src='<@ww.url value="/webwork/tooltip/tooltip.gif"  includeParams='none'/>' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
+    <img src='<@ww.url value="/webwork/tooltip/tooltip.gif" encode="false" includeParams='none'/>' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
 </#if>
 </label><#t/>
 </#if>
         <span class="required">*</span><#t/>
     </#if>
     <#if parameters.tooltip?exists>
-        <img src='<@ww.url value="/webwork/tooltip/tooltip.gif"  includeParams='none'/>' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
+        <img src='<@ww.url value="/webwork/tooltip/tooltip.gif" encode="false" includeParams='none'/>' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
     </#if>
 </#if>
     </td>

src/java/template/xhtml/tooltip.ftl

       <#if parameters.tooltipIcon?exists><#t/>
       	src='<@ww.url value="${parameters.tooltipIcon}" />' 
       <#else><#t/>
-      	src='<@ww.url value="/webwork/tooltip/tooltip.gif" />'
+      	src='<@ww.url value="/webwork/tooltip/tooltip.gif" encode="false" includeParams="none"/>'
       </#if><#t/>
       	alt="${parameters.tooltip?html}" 
       	title="${parameters.tooltip?html}" 

webapps/showcase/src/webapp/WEB-INF/decorators/main.jsp

 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
     <title><decorator:title default="WebWork Showcase"/></title>
-    <link href="<ww:url value='/styles/main.css'/>" rel="stylesheet" type="text/css" media="all"/>
-    <link href="<ww:url value='/webwork/niftycorners/niftyCorners.css'/>" rel="stylesheet" type="text/css"/>
-    <link href="<ww:url value='/webwork/niftycorners/niftyPrint.css'/>" rel="stylesheet" type="text/css" media="print"/>
+    <link href="<ww:url value='/styles/main.css' encode='false' includeParams='none'/>" rel="stylesheet" type="text/css" media="all"/>
+    <link href="<ww:url value='/webwork/niftycorners/niftyCorners.css' encode='false' includeParams='none'/>" rel="stylesheet" type="text/css"/>
+    <link href="<ww:url value='/webwork/niftycorners/niftyPrint.css' encode='false' includeParams='none'/>" rel="stylesheet" type="text/css" media="print"/>
 
-    <script language="JavaScript" type="text/javascript" src="<ww:url value='/webwork/niftycorners/nifty.js'/>"></script>
+    <script language="JavaScript" type="text/javascript" src="<ww:url value='/webwork/niftycorners/nifty.js' encode='false' includeParams='none'/>"></script>
 
     <script language="JavaScript" type="text/javascript">
 
             </div><!-- end branding -->
 
             <div id="search">
-                <img src="<ww:url value='/images/logo-small.png'/>" alt="WebWork logo"/>
+                <img src="<ww:url value='/images/logo-small.png' encode='false' includeParams='none'/>" alt="WebWork logo"/>
             </div><!-- end search -->
 
             <hr/>