You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ol...@apache.org on 2008/10/26 15:01:28 UTC
svn commit: r707994 - in
/continuum/branches/continuum-struts2/continuum-webapp/src/main:
resources/template/default/ webapp/WEB-INF/jsp/error/
Author: olamy
Date: Sun Oct 26 07:01:28 2008
New Revision: 707994
URL: http://svn.apache.org/viewvc?rev=707994&view=rev
Log:
fix ftl
Modified:
continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/template/default/checkbox.ftl
continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/template/default/file.ftl
continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/template/default/head.ftl
continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/template/default/password.ftl
continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/template/default/tooltip.ftl
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/template/default/checkbox.ftl
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/template/default/checkbox.ftl?rev=707994&r1=707993&r2=707994&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/template/default/checkbox.ftl (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/template/default/checkbox.ftl Sun Oct 26 07:01:28 2008
@@ -34,7 +34,7 @@
</#if>
:<#t/>
<#if parameters.tooltip?exists>
- <img src='<@ww.url value="/webwork/tooltip/tooltip.gif" />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
+ <img src='<@s.url value="/webwork/tooltip/tooltip.gif" />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
</#if>
</label><#t/>
</#if>
@@ -66,7 +66,7 @@
</#if>
:<#t/>
<#if parameters.tooltip?exists>
- <img src='<@ww.url value="/webwork/tooltip/tooltip.gif" />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
+ <img src='<@s.url value="/webwork/tooltip/tooltip.gif" />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
</#if>
</label><#t/>
</#if>
@@ -76,7 +76,7 @@
<span class="required">*</span><#t/>
</#if>
<#if parameters.tooltip?exists>
- <img src='<@ww.url value="/webwork/tooltip/tooltip.gif" />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
+ <img src='<@s.url value="/webwork/tooltip/tooltip.gif" />' alt="${parameters.tooltip}" title="${parameters.tooltip}" onmouseover="return escape('${parameters.tooltip?js_string}');" />
</#if>
</#if>
</td>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/template/default/file.ftl
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/template/default/file.ftl?rev=707994&r1=707993&r2=707994&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/template/default/file.ftl (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/template/default/file.ftl Sun Oct 26 07:01:28 2008
@@ -7,7 +7,7 @@
size="100"<#rt/>
</#if>
<#if parameters.nameValue?exists>
- value="<@ww.property value="parameters.nameValue"/>"<#rt/>
+ value="<@s.property value="parameters.nameValue"/>"<#rt/>
</#if>
<#if parameters.disabled?default(false)>
disabled="disabled"<#rt/>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/template/default/head.ftl
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/template/default/head.ftl?rev=707994&r1=707993&r2=707994&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/template/default/head.ftl (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/template/default/head.ftl Sun Oct 26 07:01:28 2008
@@ -1,2 +1,2 @@
-<link rel="stylesheet" href="<@ww.url value='/webwork/xhtml/styles.css' encode='false' />" type="text/css"/>
+<link rel="stylesheet" href="<@s.url value='/webwork/xhtml/styles.css' encode='false' />" type="text/css"/>
<#include "/${parameters.templateDir}/simple/head.ftl" />
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/template/default/password.ftl
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/template/default/password.ftl?rev=707994&r1=707993&r2=707994&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/template/default/password.ftl (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/template/default/password.ftl Sun Oct 26 07:01:28 2008
@@ -10,7 +10,7 @@
maxlength="${parameters.maxlength?html}"<#rt/>
</#if>
<#if parameters.nameValue?exists && parameters.showPassword?default(false)>
- value="<@ww.property value="parameters.nameValue"/>"<#rt/>
+ value="<@s.property value="parameters.nameValue"/>"<#rt/>
</#if>
<#if parameters.disabled?default(false)>
disabled="disabled"<#rt/>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/template/default/tooltip.ftl
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/template/default/tooltip.ftl?rev=707994&r1=707993&r2=707994&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/template/default/tooltip.ftl (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/template/default/tooltip.ftl Sun Oct 26 07:01:28 2008
@@ -1,9 +1,9 @@
<#if parameters.tooltip?exists><#t/>
<img
<#if parameters.tooltipIcon?exists><#t/>
- src='<@ww.url value="${parameters.tooltipIcon}" />'
+ src='<@s.url value="${parameters.tooltipIcon}" />'
<#else><#t/>
- src='<@ww.url value="/webwork/tooltip/tooltip.gif" />'
+ src='<@s.url value="/webwork/tooltip/tooltip.gif" />'
</#if><#t/>
alt="${parameters.tooltip?html}"
title="${parameters.tooltip?html}"
@@ -15,7 +15,7 @@
<#t/>this.T_BGCOLOR='${parameters.tooltipBgColor}';<#t/>
</#if><#t/>
<#if parameters.tooltipBgImg?exists><#t/>
- <#t/>this.T_BGIMG='<@ww.url value="${parameters.tooltipBgImg}" />';<#t/>
+ <#t/>this.T_BGIMG='<@s.url value="${parameters.tooltipBgImg}" />';<#t/>
</#if><#t/>
<#if parameters.tooltipBorderWidth?exists><#t/>
<#t/>this.T_BORDERWIDTH=${parameters.tooltipBorderWidth};<#t/>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp?rev=707994&r1=707993&r2=707994&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp Sun Oct 26 07:01:28 2008
@@ -17,11 +17,11 @@
~ under the License.
--%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
<%@ taglib uri="/struts-tags" prefix="s" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
<s:i18n name="localization.Continuum">
<html>
<head>