struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jhol...@apache.org
Subject svn commit: r558600 - /struts/struts2/trunk/core/src/main/resources/template/simple/
Date Mon, 23 Jul 2007 04:46:29 GMT
Author: jholmes
Date: Sun Jul 22 21:46:19 2007
New Revision: 558600

URL: http://svn.apache.org/viewvc?view=rev&rev=558600
Log:
WW-2038 Extra carriage returns in simple theme templates

Modified:
    struts/struts2/trunk/core/src/main/resources/template/simple/a-close.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/a.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/actionerror.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/actionmessage.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/combobox.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/debug.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/div-close.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/div.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/fielderror.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/file.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/form-close.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/form.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/hidden.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/inputtransferselect.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/label.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/optgroup.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/optiontransferselect.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/password.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/reset.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/scripting-events.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/table.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/text.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/textarea.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/token.ftl
    struts/struts2/trunk/core/src/main/resources/template/simple/updownselect.ftl

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/a-close.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/a-close.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/a-close.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/a-close.ftl Sun Jul 22 21:46:19
2007
@@ -1 +1 @@
-</a>
+</a>
\ No newline at end of file

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/a.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/a.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/a.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/a.ftl Sun Jul 22 21:46:19
2007
@@ -19,4 +19,4 @@
 </#if>
 <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
 <#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
->
+>
\ No newline at end of file

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/actionerror.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/actionerror.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/actionerror.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/actionerror.ftl Sun Jul 22
21:46:19 2007
@@ -4,4 +4,4 @@
 		<li><span class="errorMessage">${error}</span></li>
 	</#list>
 	</ul>
-</#if>
+</#if>
\ No newline at end of file

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/actionmessage.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/actionmessage.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/actionmessage.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/actionmessage.ftl Sun Jul
22 21:46:19 2007
@@ -4,4 +4,4 @@
 			<li><span class="actionMessage">${message}</span></li>
 		</#list>
 	</ul>
-</#if>
+</#if>
\ No newline at end of file

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/checkboxlist.ftl Sun Jul
22 21:46:19 2007
@@ -30,4 +30,4 @@
     </@s.iterator>
 <#else>
   &nbsp;
-</#if>
+</#if>
\ No newline at end of file

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/combobox.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/combobox.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/combobox.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/combobox.ftl Sun Jul 22 21:46:19
2007
@@ -47,4 +47,4 @@
     </option><#lt/>
     </@s.iterator>
 </select>
-</#if>
+</#if>
\ No newline at end of file

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/debug.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/debug.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/debug.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/debug.ftl Sun Jul 22 21:46:19
2007
@@ -56,4 +56,4 @@
         <#assign index= index + 1>
     </#list>
 </table>
-</div>
+</div>
\ No newline at end of file

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/div-close.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/div-close.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/div-close.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/div-close.ftl Sun Jul 22
21:46:19 2007
@@ -1 +1 @@
-</div>
+</div>
\ No newline at end of file

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/div.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/div.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/div.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/div.ftl Sun Jul 22 21:46:19
2007
@@ -7,4 +7,4 @@
         </#if>
 <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
 <#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
->
+>
\ No newline at end of file

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl Sun Jul
22 21:46:19 2007
@@ -108,4 +108,4 @@
            	${parameters.id}Temp.options[0].selected = true;
         }
     }
-</script>
+</script>
\ No newline at end of file

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/fielderror.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/fielderror.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/fielderror.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/fielderror.ftl Sun Jul 22
21:46:19 2007
@@ -36,4 +36,4 @@
 		</ul>
 	</#if><#t/>
 </#if><#t/>
-</#if><#t/>
+</#if><#t/>
\ No newline at end of file

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/file.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/file.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/file.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/file.ftl Sun Jul 22 21:46:19
2007
@@ -29,4 +29,4 @@
 </#if>
 <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
 <#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
-/>
+/>
\ No newline at end of file

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/form-close.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/form-close.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/form-close.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/form-close.ftl Sun Jul 22
21:46:19 2007
@@ -88,4 +88,4 @@
 	<#lt/><script type="text/javascript" src='<@s.url value="/struts/domTT.js" includeParams="none"
encode="false" />'></script>
 	<#lt/><link rel="stylesheet" type="text/css" href="<@s.url value="/struts/domTT.css"
includeParams="none" encode="false" />"/>
 	
-</#if><#t/>
+</#if><#t/>
\ No newline at end of file

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/form.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/form.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/form.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/form.ftl Sun Jul 22 21:46:19
2007
@@ -41,4 +41,4 @@
 <#if parameters.acceptcharset?exists>
  accept-charset="${parameters.acceptcharset?html}"<#rt/>
 </#if>
->
+>
\ No newline at end of file

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/hidden.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/hidden.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/hidden.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/hidden.ftl Sun Jul 22 21:46:19
2007
@@ -12,4 +12,4 @@
 <#if parameters.cssStyle?exists>
  style="${parameters.cssStyle?html}"<#rt/>
 </#if>
-/>
+/>
\ No newline at end of file

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/inputtransferselect.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/inputtransferselect.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/inputtransferselect.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/inputtransferselect.ftl Sun
Jul 22 21:46:19 2007
@@ -100,4 +100,3 @@
 </td>
 </tr>
 </table>
-

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/label.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/label.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/label.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/label.ftl Sun Jul 22 21:46:19
2007
@@ -19,4 +19,4 @@
 <#if parameters.nameValue?exists>
 <@s.property value="parameters.nameValue"/><#t/>
 </#if>
-</label>
+</label>
\ No newline at end of file

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/optgroup.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/optgroup.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/optgroup.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/optgroup.ftl Sun Jul 22 21:46:19
2007
@@ -25,4 +25,4 @@
 </#list>
 </optgroup>
 </#list>
-</#if>
+</#if>
\ No newline at end of file

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/optiontransferselect.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/optiontransferselect.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/optiontransferselect.ftl
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/optiontransferselect.ftl
Sun Jul 22 21:46:19 2007
@@ -266,5 +266,4 @@
 </#if>
 </td>
 </tr>
-</table>
-
+</table>
\ No newline at end of file

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/password.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/password.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/password.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/password.ftl Sun Jul 22 21:46:19
2007
@@ -32,4 +32,4 @@
 </#if>
 <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
 <#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
-/>
+/>
\ No newline at end of file

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/radiomap.ftl Sun Jul 22 21:46:19
2007
@@ -42,4 +42,4 @@
 <label for="${parameters.id?html}${itemKeyStr?html}"><#rt/>
     ${itemValue}<#t/>
 </label>
-</@s.iterator>
+</@s.iterator>
\ No newline at end of file

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/reset.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/reset.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/reset.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/reset.ftl Sun Jul 22 21:46:19
2007
@@ -35,4 +35,4 @@
 <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
 <#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
 />
-</#if>
+</#if>
\ No newline at end of file

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/scripting-events.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/scripting-events.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/scripting-events.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/scripting-events.ftl Sun
Jul 22 21:46:19 2007
@@ -39,4 +39,4 @@
 </#if>
 <#if parameters.onchange?exists>
  onchange="${parameters.onchange?html}"<#rt/>
-</#if>
+</#if>
\ No newline at end of file

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/select.ftl Sun Jul 22 21:46:19
2007
@@ -69,4 +69,4 @@
 
 <#include "/${parameters.templateDir}/simple/optgroup.ftl" />
 
-</select>
+</select>
\ No newline at end of file

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/table.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/table.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/table.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/table.ftl Sun Jul 22 21:46:19
2007
@@ -51,4 +51,4 @@
         </td>
     </tr>
 </table>
-</#if>
+</#if>
\ No newline at end of file

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/text.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/text.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/text.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/text.ftl Sun Jul 22 21:46:19
2007
@@ -32,4 +32,4 @@
 </#if>
 <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
 <#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
-/>
+/>
\ No newline at end of file

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/textarea.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/textarea.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/textarea.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/textarea.ftl Sun Jul 22 21:46:19
2007
@@ -32,4 +32,4 @@
 <#if parameters.nameValue?exists>
 <@s.property value="parameters.nameValue"/><#t/>
 </#if>
-</textarea>
+</textarea>
\ No newline at end of file

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/token.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/token.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/token.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/token.ftl Sun Jul 22 21:46:19
2007
@@ -1,2 +1,2 @@
 <input type="hidden" name="${parameters.tokenNameField?default("")}" value="${parameters.name?default("")?html}"
/>
-<input type="hidden" name="${parameters.name?default("")}" value="${parameters.token?default("")?html}"
/>
+<input type="hidden" name="${parameters.name?default("")}" value="${parameters.token?default("")?html}"
/>
\ No newline at end of file

Modified: struts/struts2/trunk/core/src/main/resources/template/simple/updownselect.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/updownselect.ftl?view=diff&rev=558600&r1=558599&r2=558600
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/updownselect.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/updownselect.ftl Sun Jul
22 21:46:19 2007
@@ -32,4 +32,4 @@
 	</#if><#t/>
 </#if><#t/>
 </td></tr>
-</table>
+</table>
\ No newline at end of file



Mime
View raw message