Author: jkuhnert
Date: Fri Mar 17 07:18:09 2006
New Revision: 386652
URL: http://svn.apache.org/viewcvs?rev=386652&view=rev
Log:
applied patches
Added:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/ValidationStrings_fi.properties
Modified:
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/ajax/Timeout.jwc
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/link/PopupLinkRenderer.java
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/TableFormPages.html
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/TableFormPages.jwc
jakarta/tapestry/trunk/status.xml
Modified:
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/ajax/Timeout.jwc
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/ajax/Timeout.jwc?rev=386652&r1=386651&r2=386652&view=diff
==============================================================================
---
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/ajax/Timeout.jwc
(original)
+++
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/ajax/Timeout.jwc
Fri Mar 17 07:18:09 2006
@@ -40,7 +40,7 @@
</description>
</parameter>
- <parameter name="warningMessage" default-value="message: warning">
+ <parameter name="warningMessage" default-value="message:warning">
<description>
The warning message that will appear when the session is about to
exipre.
Here {0} is replaced by the number of minutes that remain until
expiration and
Modified:
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/link/PopupLinkRenderer.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/link/PopupLinkRenderer.java?rev=386652&r1=386651&r2=386652&view=diff
==============================================================================
---
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/link/PopupLinkRenderer.java
(original)
+++
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/link/PopupLinkRenderer.java
Fri Mar 17 07:18:09 2006
@@ -54,11 +54,15 @@
}
/**
- * @see DefaultLinkRenderer#constructURL(org.apache.tapestry.engine.ILink,
String,
+ * @see
DefaultLinkRenderer#constructURL(org.apache.tapestry.components.ILinkComponent,
* org.apache.tapestry.IRequestCycle)
*/
protected String constructURL(ILinkComponent component, IRequestCycle
cycle)
{
+ if (cycle.isRewinding()) {
+ return null;
+ }
+
String anchor = component.getAnchor();
ILink link = component.getLink(cycle);
Modified:
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/TableFormPages.html
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/TableFormPages.html?rev=386652&r1=386651&r2=386652&view=diff
==============================================================================
---
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/TableFormPages.html
(original)
+++
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/TableFormPages.html
Fri Mar 17 07:18:09 2006
@@ -15,27 +15,30 @@
-->
<span jwcid="$content$">
-<span jwcid="hiddenCurrentPage"/>
-<span jwcid="hiddenPageCount"/>
-<span jwcid="hiddenStartPage"/>
-<span jwcid="hiddenStopPage"/>
-
-<a jwcid="linkFirst"><<</a>
-<a jwcid="linkBack"><</a>
-
-<span jwcid="iterPage">
-
- <span jwcid="condCurrent">
- <b><span jwcid="insertCurrentPage"/></b>
- </span>
-
- <span jwcid="condOther">
- <a jwcid="linkPage"><span jwcid="insertOtherPage"/></a>
- </span>
+<span jwcid="informal">
-</span>
+ <span jwcid="hiddenCurrentPage"/>
+ <span jwcid="hiddenPageCount"/>
+ <span jwcid="hiddenStartPage"/>
+ <span jwcid="hiddenStopPage"/>
+
+ <a jwcid="linkFirst"><<</a>
+ <a jwcid="linkBack"><</a>
+
+ <span jwcid="iterPage">
+
+ <span jwcid="condCurrent">
+ <b><span jwcid="insertCurrentPage"/></b>
+ </span>
-<a jwcid="linkFwd">></a>
-<a jwcid="linkLast">>></a>
+ <span jwcid="condOther">
+ <a jwcid="linkPage"><span jwcid="insertOtherPage"/></a>
+ </span>
+ </span>
+
+ <a jwcid="linkFwd">></a>
+ <a jwcid="linkLast">>></a>
+
+</span>
</span>
Modified:
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/TableFormPages.jwc
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/TableFormPages.jwc?rev=386652&r1=386651&r2=386652&view=diff
==============================================================================
---
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/TableFormPages.jwc
(original)
+++
jakarta/tapestry/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/TableFormPages.jwc
Fri Mar 17 07:18:09 2006
@@ -39,6 +39,8 @@
</description>
</parameter>
+ <component id="informal" type="Any" inherit-informal-parameters="yes"/>
+
<property-specification name="selectedPage" type="int"/>
<component id="hiddenCurrentPage" type="Hidden">
Added:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/ValidationStrings_fi.properties
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/ValidationStrings_fi.properties?rev=386652&view=auto
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/ValidationStrings_fi.properties
(added)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/valid/ValidationStrings_fi.properties
Fri Mar 17 07:18:09 2006
@@ -0,0 +1,24 @@
+# $Id$
+
+field-is-required=Anna syöte kenttään: {0}.
+field-too-short=Kentän {1} arvon minimipituus on {0} merkkiä.
+
+invalid-date-format=Kentän {0} päivämäärä on väärää muotoa. Muoto on {1}.
+invalid-int-format=Kentän {0} arvon pitää olla kokonaisluku.
+invalid-format=Kentän {0} syöte on väärää muotoa.
+invalid-numeric-format=Kentän {0} arvon pitää olla luku.
+
+date-too-early=Kentän {0} päivämäärä ei saa olla ennen {1}.
+date-too-late=Kentän {0} päivämäärä ei saa olla jälkeen {1}.
+
+number-too-small=Kentän {0} arvo ei saa olla pienempi {1}.
+number-too-large=Kentän {0} arvo ei saa olla suurempi kuin {1}.
+
+number-range=Kentän {0} arvon tulee olla välillä {1}-{2}.
+
+invalid-email-format=Sähköpostiosoite kentässä {0} on väärää muotoa. Muoto on
[EMAIL PROTECTED]
+
+pattern-not-matched=Kentän {0} arvo ei ole vaaditussa muodossa {1}.
+
+invalid-url-format = URL on väärää muotoa.
+disallowed-protocol = Protokolla ei kelpaa - protokollan pitää olla {0}.
Modified: jakarta/tapestry/trunk/status.xml
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/status.xml?rev=386652&r1=386651&r2=386652&view=diff
==============================================================================
--- jakarta/tapestry/trunk/status.xml (original)
+++ jakarta/tapestry/trunk/status.xml Fri Mar 17 07:18:09 2006
@@ -141,6 +141,15 @@
Added new scriptAsset parameter, as well as param checking to be sure
that only one
of scriptPath or scriptAsset can be set.
</action>
+ <action type="fix" dev="JK" fixes-bug="TAPESTRY-794" due-to="Brian K.
Wallace" >
+ Removed the space between the message binding and the message key for
Timeout.jwc.
+ </action>
+ <action type="fix" dev="JK" fixes-bug="TAPESTRY-774" due-to="Brian K.
Wallace" >
+ It seems that DirectLink and/or PopupLinkRenderer should be checking
for Form rewind and not rendering in that case.
+ </action>
+ <action type="fix" dev="JK" fixes-bug="TAPESTRY-221" due-to="Brian K.
Wallace" >
+ Added informal-parameters to jwc and html for TableFormPages
+ </action>
</release>
<release version="4.0" date="Jan 6 2006">
<action type="update" dev="HLS">Add link to DeveloperWorks Tapestry
article</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
