[jira] [Commented] (TAP5-1474) [GSoC] add out-of-the-box protection against cross-site request forgery (CSRF)
[ https://issues.apache.org/jira/browse/TAP5-1474?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13756431#comment-13756431 ] Christian Köberl commented on TAP5-1474: Is there any plan for including the finished module (http://code.google.com/p/gsoc2011-csrf-protection/) in Tapestry? [GSoC] add out-of-the-box protection against cross-site request forgery (CSRF) -- Key: TAP5-1474 URL: https://issues.apache.org/jira/browse/TAP5-1474 Project: Tapestry 5 Issue Type: New Feature Components: tapestry-core Affects Versions: 5.2 Reporter: Ulrich Stärk Labels: gsoc2011 There are several approaches to protect against CSRF. A student working on this task will evaluate the possible solutions, discuss with the community which to implement and implement and test the chosen approach. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Reopened] (TAP5-1973) :443 added to URLs when using the Link.toAbsoluteURI(true)
[
https://issues.apache.org/jira/browse/TAP5-1973?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Kalle Korhonen reopened TAP5-1973:
--
Assignee: Kalle Korhonen (was: Howard M. Lewis Ship)
:443 added to URLs when using the Link.toAbsoluteURI(true)
--
Key: TAP5-1973
URL: https://issues.apache.org/jira/browse/TAP5-1973
Project: Tapestry 5
Issue Type: Bug
Components: tapestry-core
Affects Versions: 5.3.4, 5.4
Reporter: Howard M. Lewis Ship
Assignee: Kalle Korhonen
Labels: fixed-in-5.4-js-rewrite
Fix For: 5.3.5, 5.4
An error in the code means that when secure is true and the port is set to
443, then :443 is appended:
int port = secure ? secureHostPort : hostPort;
String portSuffix = ;
if (port = 0) {
port = request.getServerPort();
int schemeDefaultPort = request.isSecure() ? 443 : 80;
portSuffix = port == schemeDefaultPort ? : : + port;
}
else if (secure port != 443) portSuffix = : + port;
else if (port != 80) portSuffix = : + port;
String hostname = .equals(this.hostname) ? request.getServerName()
: this.hostname.startsWith($) ? System.getenv(this.hostname.substring(1)) :
this.hostname;
return String.format(%s://%s%s, secure ? https : http,
hostname, portSuffix);
secure == true port != 443 is false, so
port != 80 is evaluated, it true, so
:443 is appended.
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Assigned] (TAP5-2165) Resource name case check breaks applications on windows
[ https://issues.apache.org/jira/browse/TAP5-2165?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Howard M. Lewis Ship reassigned TAP5-2165: -- Assignee: Howard M. Lewis Ship Resource name case check breaks applications on windows --- Key: TAP5-2165 URL: https://issues.apache.org/jira/browse/TAP5-2165 Project: Tapestry 5 Issue Type: Bug Components: tapestry-core Affects Versions: 5.4 Reporter: Ville Virtanen Assignee: Howard M. Lewis Ship Priority: Blocker The fix made in TAP5-1007 broke apps when developed in windows probably due to hard coded path separator. Discussion in mailing list: http://apache-tapestry-mailing-list-archives.1045711.n5.nabble.com/5-4-alpha-15-resource-exceptions-td5723122.html -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
git commit: TAP5-2165: Resource name case check breaks applications on windows
Updated Branches:
refs/heads/master 2f0612bb5 - 0d784d945
TAP5-2165: Resource name case check breaks applications on windows
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/0d784d94
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/0d784d94
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/0d784d94
Branch: refs/heads/master
Commit: 0d784d94547cbcb06a53b949c9e293a1922a7aa5
Parents: 2f0612b
Author: Howard M. Lewis Ship hls...@apache.org
Authored: Tue Sep 3 16:05:09 2013 -0700
Committer: Howard M. Lewis Ship hls...@apache.org
Committed: Tue Sep 3 16:05:18 2013 -0700
--
.../apache/tapestry5/ioc/internal/util/AbstractResource.java| 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0d784d94/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java
--
diff --git
a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java
b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java
index 23773cd..7020cb9 100644
---
a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java
+++
b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java
@@ -318,7 +318,10 @@ public abstract class AbstractResource extends LockSupport
implements Resource
try
{
-expectedFileName = extractFile(file.getCanonicalPath());
+// On Windows, the canonical path uses backslash ('\') for the
separator; an easy hack
+// is to convert the platform file separator to match sane
operating systems (which use a foward slash).
+String sep = System.getProperty(file.separator);
+expectedFileName =
extractFile(file.getCanonicalPath().replace(sep, /));
} catch (IOException e)
{
return;
[jira] [Closed] (TAP5-2165) Resource name case check breaks applications on windows
[ https://issues.apache.org/jira/browse/TAP5-2165?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Howard M. Lewis Ship closed TAP5-2165. -- Resolution: Fixed Fix Version/s: 5.4 Resource name case check breaks applications on windows --- Key: TAP5-2165 URL: https://issues.apache.org/jira/browse/TAP5-2165 Project: Tapestry 5 Issue Type: Bug Components: tapestry-core Affects Versions: 5.4 Reporter: Ville Virtanen Assignee: Howard M. Lewis Ship Priority: Blocker Fix For: 5.4 The fix made in TAP5-1007 broke apps when developed in windows probably due to hard coded path separator. Discussion in mailing list: http://apache-tapestry-mailing-list-archives.1045711.n5.nabble.com/5-4-alpha-15-resource-exceptions-td5723122.html -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (TAP5-2165) Resource name case check breaks applications on windows
[ https://issues.apache.org/jira/browse/TAP5-2165?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13757270#comment-13757270 ] Hudson commented on TAP5-2165: -- SUCCESS: Integrated in tapestry-trunk-freestyle #1144 (See [https://builds.apache.org/job/tapestry-trunk-freestyle/1144/]) TAP5-2165: Resource name case check breaks applications on windows (hlship: rev 0d784d94547cbcb06a53b949c9e293a1922a7aa5) * tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java Resource name case check breaks applications on windows --- Key: TAP5-2165 URL: https://issues.apache.org/jira/browse/TAP5-2165 Project: Tapestry 5 Issue Type: Bug Components: tapestry-core Affects Versions: 5.4 Reporter: Ville Virtanen Assignee: Howard M. Lewis Ship Priority: Blocker Fix For: 5.4 The fix made in TAP5-1007 broke apps when developed in windows probably due to hard coded path separator. Discussion in mailing list: http://apache-tapestry-mailing-list-archives.1045711.n5.nabble.com/5-4-alpha-15-resource-exceptions-td5723122.html -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
[1/2] git commit: Change Label (back) to rendering class=control-label
Updated Branches:
refs/heads/master 0d784d945 - a586a1af6
Change Label (back) to rendering class=control-label
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/9df0250b
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/9df0250b
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/9df0250b
Branch: refs/heads/master
Commit: 9df0250b46fcacbcc566517a0d281273f9271238
Parents: 0d784d9
Author: Howard M. Lewis Ship hls...@apache.org
Authored: Tue Sep 3 16:26:49 2013 -0700
Committer: Howard M. Lewis Ship hls...@apache.org
Committed: Tue Sep 3 16:26:49 2013 -0700
--
54_RELEASE_NOTES.txt | 11 +++
.../org/apache/tapestry5/corelib/components/Label.java | 2 +-
.../apache/tapestry5/integration/app1/MiscTests.groovy | 4 ++--
.../org/apache/tapestry5/integration/app1/FormTests.java | 6 --
4 files changed, 18 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9df0250b/54_RELEASE_NOTES.txt
--
diff --git a/54_RELEASE_NOTES.txt b/54_RELEASE_NOTES.txt
index faad914..1840d92 100644
--- a/54_RELEASE_NOTES.txt
+++ b/54_RELEASE_NOTES.txt
@@ -196,6 +196,17 @@ http://twitter.github.com/bootstrap/base-css.html#forms
You may also use the new FormGroup mixin for most fields.
+## Form element components
+
+TextField, PasswordField, TextArea, and Select now render the CSS class
attribute form-control; you may add additional
+CSS class names with the `class` informal parameter. Generally, you will want
to add Bootstrap `col-md-x` class names
+to control the size of the element (otherwise it will stretch to 100% of the
available width).
+
+## LabelComponent
+
+The Label component now renders the CSS class attribute as control-label;
additional CSS class names may be provided
+using the `class` informal parameter.
+
## BeanEditor / BeanEditForm
The property edit blocks contributed to the BeanBlockSource service should
expect to be nested inside a
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9df0250b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Label.java
--
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Label.java
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Label.java
index 7bb9f4a..b030929 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Label.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Label.java
@@ -64,7 +64,7 @@ public class Label
{
decorator.beforeLabel(field);
-labelElement = writer.element(label);
+labelElement = writer.element(label, class, control-label);
resources.renderInformalParameters(writer);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9df0250b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/MiscTests.groovy
--
diff --git
a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/MiscTests.groovy
b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/MiscTests.groovy
index f0a5c3d..b2bde4e 100644
---
a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/MiscTests.groovy
+++
b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/MiscTests.groovy
@@ -40,8 +40,8 @@ class MiscTests extends TapestryCoreTestCase {
{
openLinks Override Label Class Demo
-assertSourcePresent label for=\firstName\First Name/label,
-label for=\lastName\
class=\dummyClassName\Last Name/label
+assertSourcePresent label for=\firstName\
class=\control-label\First Name/label,
+label for=\lastName\ class=\control-label
dummyClassName\Last Name/label
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9df0250b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
--
diff --git
a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
index 4c551b6..9e4ce92 100644
---
a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
+++
b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
@@ -16,6 +16,7 @@ package org.apache.tapestry5.integration.app1;
import org.apache.tapestry5.corelib.components.Form;
import
[2/2] git commit: Add class=form-control to the KaptchaField
Add class=form-control to the KaptchaField
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/a586a1af
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/a586a1af
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/a586a1af
Branch: refs/heads/master
Commit: a586a1af6df28fcf9e2a8567797039c187c332ea
Parents: 9df0250
Author: Howard M. Lewis Ship hls...@apache.org
Authored: Tue Sep 3 17:07:07 2013 -0700
Committer: Howard M. Lewis Ship hls...@apache.org
Committed: Tue Sep 3 17:07:07 2013 -0700
--
.../kaptcha/components/KaptchaField.java| 7 ++-
.../java/kaptcha/demo/components/Layout.java| 5 +-
.../kaptcha/demo/components/Layout.tml | 24 --
.../test/resources/kaptcha/demo/pages/Index.tml | 12 ++---
.../kaptcha/demo/pages/KaptchaDemo.tml | 50 +---
5 files changed, 44 insertions(+), 54 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a586a1af/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/components/KaptchaField.java
--
diff --git
a/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/components/KaptchaField.java
b/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/components/KaptchaField.java
index a559aba..880aaf8 100644
---
a/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/components/KaptchaField.java
+++
b/tapestry-kaptcha/src/main/java/org/apache/tapestry5/kaptcha/components/KaptchaField.java
@@ -1,4 +1,4 @@
-// Copyright 2011, 2012 The Apache Software Foundation
+// Copyright 2011-2013 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the License);
// you may not use this file except in compliance with the License.
@@ -29,7 +29,8 @@ import org.apache.tapestry5.services.FieldValidatorSource;
/**
* Field paired with a {@link KaptchaImage} to ensure that the user has
provided
- * the correct value.
+ * the correct value. Renders a class attribute of form-control, which can
be extended
+ * via the class informal attribute.
*
* @since 5.3
* @tapestrydoc
@@ -93,6 +94,8 @@ public class KaptchaField extends AbstractField
id, getClientId(),
+class, form-control,
+
name, getControlName(),
value, visible ? validationTracker.getInput(this) : );
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a586a1af/tapestry-kaptcha/src/test/java/kaptcha/demo/components/Layout.java
--
diff --git a/tapestry-kaptcha/src/test/java/kaptcha/demo/components/Layout.java
b/tapestry-kaptcha/src/test/java/kaptcha/demo/components/Layout.java
index f15a5a8..388df77 100644
--- a/tapestry-kaptcha/src/test/java/kaptcha/demo/components/Layout.java
+++ b/tapestry-kaptcha/src/test/java/kaptcha/demo/components/Layout.java
@@ -1,4 +1,4 @@
-// Copyright 2011 The Apache Software Foundation
+// Copyright 2011-2013 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the License);
// you may not use this file except in compliance with the License.
@@ -14,6 +14,9 @@
package kaptcha.demo.components;
+import org.apache.tapestry5.annotations.Import;
+
+@Import(stack = core)
public class Layout
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a586a1af/tapestry-kaptcha/src/test/resources/kaptcha/demo/components/Layout.tml
--
diff --git
a/tapestry-kaptcha/src/test/resources/kaptcha/demo/components/Layout.tml
b/tapestry-kaptcha/src/test/resources/kaptcha/demo/components/Layout.tml
index 8156677..35e1143 100644
--- a/tapestry-kaptcha/src/test/resources/kaptcha/demo/components/Layout.tml
+++ b/tapestry-kaptcha/src/test/resources/kaptcha/demo/components/Layout.tml
@@ -1,23 +1,17 @@
-html xmlns=http://www.w3.org/1999/xhtml;
xmlns:t=http://tapestry.apache.org/schema/tapestry_5_3.xsd;
xmlns:p=tapestry:parameter
- head
+html xmlns=http://www.w3.org/1999/xhtml;
xmlns:t=http://tapestry.apache.org/schema/tapestry_5_3.xsd;
+head
title${componentResources.pageName}/title
- /head
+/head
+body
+div class=container
- body
h1${componentResources.pageName}/h1
t:body/
-hr/
+t:pagelink class=btn btn-default page=indexindex/t:pagelink
-p
- [
- t:pagelink page=indexindex/t:pagelink
- ] |
- [
- t:pagelink page=${componentResources.pageName}refresh/t:pagelink
- ]
-/p
-
- /body
+t:pagelink class=btn btn-default
page=${componentResources.pageName}refresh/t:pagelink
+/div
+/body
/html
\ No newline at end of file
git commit: Simplify layout
Updated Branches:
refs/heads/master a586a1af6 - 3ae1187eb
Simplify layout
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/3ae1187e
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/3ae1187e
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/3ae1187e
Branch: refs/heads/master
Commit: 3ae1187ebc9428c5fa5de030320d31596867de41
Parents: a586a1a
Author: Howard M. Lewis Ship hls...@apache.org
Authored: Tue Sep 3 17:11:05 2013 -0700
Committer: Howard M. Lewis Ship hls...@apache.org
Committed: Tue Sep 3 17:11:05 2013 -0700
--
.../kaptcha/demo/pages/KaptchaDemo.tml | 23 +++-
1 file changed, 8 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/3ae1187e/tapestry-kaptcha/src/test/resources/kaptcha/demo/pages/KaptchaDemo.tml
--
diff --git
a/tapestry-kaptcha/src/test/resources/kaptcha/demo/pages/KaptchaDemo.tml
b/tapestry-kaptcha/src/test/resources/kaptcha/demo/pages/KaptchaDemo.tml
index 228eb0f..5f30d5f 100644
--- a/tapestry-kaptcha/src/test/resources/kaptcha/demo/pages/KaptchaDemo.tml
+++ b/tapestry-kaptcha/src/test/resources/kaptcha/demo/pages/KaptchaDemo.tml
@@ -3,23 +3,16 @@
p id=message${message}/p
-t:form t:id=form
-t:errors/
-
-div class=form-group
+t:form t:id=form
+t:errors/
+div class=form-group
t:kaptchaimage t:id=ki/
-/div
-
-div class=form-group
-
-t:label for=kf class=col-2/
-div class=col-md-2
-t:kaptchafield label=Security Check t:id=kf
image=ki/
-/div
-/div
+t:label for=kf/
+t:kaptchafield label=Security Check t:id=kf image=ki/
+/div
-input class=btn btn-primary type=submit value=Go/
-/t:form
+input class=btn btn-primary type=submit value=Go/
+/t:form
/t:layout
\ No newline at end of file
[jira] [Updated] (TAP5-2163) Adapt DateField style to Bootstrap 3
[ https://issues.apache.org/jira/browse/TAP5-2163?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Howard M. Lewis Ship updated TAP5-2163: --- Summary: Adapt DateField style to Bootstrap 3 (was: Adapt DateField style to Bootstrap(3)) Adapt DateField style to Bootstrap 3 Key: TAP5-2163 URL: https://issues.apache.org/jira/browse/TAP5-2163 Project: Tapestry 5 Issue Type: Bug Components: tapestry-core Affects Versions: 5.4 Reporter: Jochen Kemnade Assignee: Howard M. Lewis Ship Labels: bootstrap, css, javascript, patch, style Attachments: 0001-style-changes-to-adapt-to-Bootstrap-3.patch The DateField component's popup should be styled using Bootstrap 3 mechanisms. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
git commit: TAP5-2163: Adapt DateField style to Bootstrap 3
Updated Branches:
refs/heads/master 3ae1187eb - 2cef4982e
TAP5-2163: Adapt DateField style to Bootstrap 3
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/2cef4982
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/2cef4982
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/2cef4982
Branch: refs/heads/master
Commit: 2cef4982e017acaf3e6e0fc774db5fc19e49ca03
Parents: 3ae1187
Author: Howard M. Lewis Ship hls...@apache.org
Authored: Tue Sep 3 17:23:44 2013 -0700
Committer: Howard M. Lewis Ship hls...@apache.org
Committed: Tue Sep 3 17:23:44 2013 -0700
--
.../META-INF/modules/t5/core/datefield.coffee | 4 +--
.../tapestry5/corelib/components/DateField.java | 2 +-
.../tapestry5/datepicker_106/css/datepicker.css | 36 ++--
.../tapestry5/datepicker_106/js/datepicker.js | 16 ++---
.../META-INF/assets/tapestry5/tapestry.css | 2 +-
5 files changed, 19 insertions(+), 41 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2cef4982/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/datefield.coffee
--
diff --git
a/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/datefield.coffee
b/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/datefield.coffee
index a1b1bfd..20a9782 100644
---
a/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/datefield.coffee
+++
b/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/datefield.coffee
@@ -114,7 +114,7 @@ define [./dom, ./events, ./messages, ./ajax,
underscore, ./fields],
createPopup: -
@datePicker = new DatePicker()
@datePicker.setFirstWeekDay datePickerFirstDay
-@popup = dom.create(div, { class: datefield-popup}).append
@datePicker.create()
+@popup = dom.create(div, { class: datefield-popup well}).append
@datePicker.create()
@container.insertAfter @popup
@datePicker.onselect = _.bind @onSelect, this
@@ -160,4 +160,4 @@ define [./dom, ./events, ./messages, ./ajax,
underscore, ./fields],
dom.onDocument events.zone.didUpdate, - scan this
# Exports nothing.
-return null
\ No newline at end of file
+return null
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2cef4982/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java
--
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java
index 99676de..96db67d 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java
@@ -246,7 +246,7 @@ public class DateField extends AbstractField
writer.element(button,
type, button,
-class, btn,
+class, btn btn-default,
alt, [Show]);
writer.element(span, class, glyphicon glyphicon-calendar);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2cef4982/tapestry-core/src/main/resources/META-INF/assets/tapestry5/datepicker_106/css/datepicker.css
--
diff --git
a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/datepicker_106/css/datepicker.css
b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/datepicker_106/css/datepicker.css
index fb4cdaf..46794b8 100644
---
a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/datepicker_106/css/datepicker.css
+++
b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/datepicker_106/css/datepicker.css
@@ -1,8 +1,5 @@
.datePicker {
-border: 1px solid WindowText;
-background: Window;
-width: 170px;
-padding: 0px;
+width: 180px;
cursor: default;
-moz-user-focus: normal;
}
@@ -11,7 +8,6 @@
font: smallcaption;
font: small-caption;
text-align: center;
-color: WindowText;
cursor: default;
font-weight: normal !important;
-moz-user-select: none;
@@ -23,7 +19,6 @@
}
.datePicker .header {
-background: Window;
padding: 3px;
border-bottom: 1px solid WindowText;
}
@@ -90,35 +85,10 @@
width: 100%;
}
-.datePicker button {
-border-width: 1px;
-font: Caption;
-font-weight: normal !important;
-display: block;
-}
-
-.datePicker button.btn {
-font-size: x-small;
-}
-
-.datePicker .previousButton {
-background: buttonface url(../images/arrow.left.png) no-repeat center
center;
-}
-
-.datePicker .nextButton {
-background: buttonface
[jira] [Closed] (TAP5-2163) Adapt DateField style to Bootstrap 3
[ https://issues.apache.org/jira/browse/TAP5-2163?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Howard M. Lewis Ship closed TAP5-2163. -- Resolution: Fixed Fix Version/s: 5.4 Adapt DateField style to Bootstrap 3 Key: TAP5-2163 URL: https://issues.apache.org/jira/browse/TAP5-2163 Project: Tapestry 5 Issue Type: Bug Components: tapestry-core Affects Versions: 5.4 Reporter: Jochen Kemnade Assignee: Howard M. Lewis Ship Labels: bootstrap, css, javascript, patch, style Fix For: 5.4 Attachments: 0001-style-changes-to-adapt-to-Bootstrap-3.patch The DateField component's popup should be styled using Bootstrap 3 mechanisms. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Closed] (TAP5-1007) When Tapestry is loading templates or other files on case-insensitive OSs (Windows) it should trigger an error if the file name case is incorrect (which will result in a ru
[ https://issues.apache.org/jira/browse/TAP5-1007?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Howard M. Lewis Ship closed TAP5-1007. -- Resolution: Fixed I believe this is now working correctly even on Windows. When Tapestry is loading templates or other files on case-insensitive OSs (Windows) it should trigger an error if the file name case is incorrect (which will result in a runtime failure on case-sensitive OSs, such as Linux) --- Key: TAP5-1007 URL: https://issues.apache.org/jira/browse/TAP5-1007 Project: Tapestry 5 Issue Type: Improvement Components: tapestry-core Affects Versions: 5.2 Reporter: Howard M. Lewis Ship Assignee: Howard M. Lewis Ship Fix For: 5.4 In other words, on Windows you might find file myComponent.tml when it should be named MyComponent.tml (to match the name of the class, MyComponent). This is irritating to find in testing or production, and Tapestry should be able to add a check that the case of the file name does not match the expected case. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
[1/3] git commit: Add missing btn-default to the cancel button
Updated Branches: refs/heads/master 2cef4982e - 7171439c1 Add missing btn-default to the cancel button Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/89ade372 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/89ade372 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/89ade372 Branch: refs/heads/master Commit: 89ade3722dbe6c5695110945f97635d8c6cd2bb4 Parents: 2cef498 Author: Howard M. Lewis Ship hls...@apache.org Authored: Tue Sep 3 17:30:38 2013 -0700 Committer: Howard M. Lewis Ship hls...@apache.org Committed: Tue Sep 3 17:30:38 2013 -0700 -- .../org/apache/tapestry5/corelib/components/BeanEditForm.tml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/89ade372/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/BeanEditForm.tml -- diff --git a/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/BeanEditForm.tml b/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/BeanEditForm.tml index dd17d12..99b747d 100644 --- a/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/BeanEditForm.tml +++ b/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/BeanEditForm.tml @@ -10,7 +10,7 @@ /div t:if test=cancel div class=btn-group -t:submit t:id=cancel mode=cancel class=btn value=message:core-cancel-label/ +t:submit t:id=cancel mode=cancel class=btn btn-default value=message:core-cancel-label/ /div /t:if /div
[2/3] git commit: Make use of FormGroup mixin Modify PropertyEditor to begin/end a Heartbeat, needed by FormGroup mixin
Make use of FormGroup mixin
Modify PropertyEditor to begin/end a Heartbeat, needed by FormGroup mixin
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/c7d47248
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/c7d47248
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/c7d47248
Branch: refs/heads/master
Commit: c7d4724836c5afeea47c22073b371b9f0515b148
Parents: 89ade37
Author: Howard M. Lewis Ship hls...@apache.org
Authored: Tue Sep 3 17:31:12 2013 -0700
Committer: Howard M. Lewis Ship hls...@apache.org
Committed: Tue Sep 3 17:31:12 2013 -0700
--
.../corelib/components/PropertyEditor.java | 9 -
.../corelib/pages/PropertyEditBlocks.tml| 42
2 files changed, 16 insertions(+), 35 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/c7d47248/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PropertyEditor.java
--
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PropertyEditor.java
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PropertyEditor.java
index 7a04dc6..c79c192 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PropertyEditor.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PropertyEditor.java
@@ -1,4 +1,4 @@
-// Copyright 2007, 2008, 2009, 2011, 2012 The Apache Software Foundation
+// Copyright 2007-2013 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the License);
// you may not use this file except in compliance with the License.
@@ -140,6 +140,9 @@ public class PropertyEditor
@Environmental
private FormSupport formSupport;
+@Inject
+private Heartbeat heartbeat;
+
private PropertyModel propertyModel;
BeanBlockSource defaultBeanBlockSource()
@@ -217,6 +220,8 @@ public class PropertyEditor
{
beanValidationContext.setCurrentProperty(propertyName);
}
+
+heartbeat.begin();
}
/**
@@ -225,6 +230,8 @@ public class PropertyEditor
*/
void cleanupEnvironment()
{
+heartbeat.end();
+
environment.pop(PropertyEditContext.class);
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/c7d47248/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/PropertyEditBlocks.tml
--
diff --git
a/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/PropertyEditBlocks.tml
b/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/PropertyEditBlocks.tml
index d8e4e12..b22f161 100644
---
a/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/PropertyEditBlocks.tml
+++
b/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/PropertyEditBlocks.tml
@@ -1,25 +1,16 @@
-div xml:space=default
xmlns:t=http://tapestry.apache.org/schema/tapestry_5_3.xsd;
+div xmlns:t=http://tapestry.apache.org/schema/tapestry_5_3.xsd;
t:block id=text
-div class=form-group
-t:label for=textField/
-input t:id=textField/
-/div
+input t:mixins=formgroup t:id=textField/
/t:block
t:block id=number
-div class=form-group
-t:label for=numberField/
-input t:id=numberField class=t-number/
-/div
+input t:id=numberField t:mixins=formgroup class=t-number/
/t:block
t:block id=enum
-div class=form-group
-t:label for=select/
-input t:id=select/
-/div
+input t:id=select t:mixins=formgroup/
/t:block
t:block id=boolean
@@ -30,40 +21,23 @@
${context.label}
/label
/div
-
/t:block
t:block id=date
-
-div class=form-group
-t:label for=dateField/
-input t:id=dateField/
-/div
-
+input t:id=dateField t:mixins=formgroup/
/t:block
t:block id=calendar
-
-div class=form-group
-t:label for=calendarField/
-input t:id=calendarField/
-/div
-
+input t:id=calendarField t:mixins=formgroup/
/t:block
t:block id=password
-div class=form-group
-t:label for=passwordField/
-input t:id=passwordField/
-/div
+input t:id=passwordField t:mixins=formgroup/
/t:block
t:block id=longtext
-div class=form-group
-t:label for=textarea/
-textarea t:id=textarea/
-/div
+textarea t:id=textarea t:mixins=formgroup/
/t:block
/div
\ No newline at
[3/3] git commit: Ensure that the label rendered by the FormGroup mixin includes the control-label CSS selector
Ensure that the label rendered by the FormGroup mixin includes the
control-label CSS selector
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/7171439c
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/7171439c
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/7171439c
Branch: refs/heads/master
Commit: 7171439c1e5cc28e11f576c8ca54e78bf54d65eb
Parents: c7d4724
Author: Howard M. Lewis Ship hls...@apache.org
Authored: Tue Sep 3 17:53:14 2013 -0700
Committer: Howard M. Lewis Ship hls...@apache.org
Committed: Tue Sep 3 17:53:14 2013 -0700
--
.../apache/tapestry5/corelib/mixins/FormGroup.java| 14 --
.../apache/tapestry5/integration/app1/GridTests.java | 2 ++
2 files changed, 14 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7171439c/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/FormGroup.java
--
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/FormGroup.java
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/FormGroup.java
index 51d2616..2f86675 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/FormGroup.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/FormGroup.java
@@ -16,6 +16,8 @@ package org.apache.tapestry5.corelib.mixins;
import org.apache.tapestry5.Field;
import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.ValidationDecorator;
+import org.apache.tapestry5.annotations.Environmental;
import org.apache.tapestry5.annotations.HeartbeatDeferred;
import org.apache.tapestry5.annotations.InjectContainer;
import org.apache.tapestry5.dom.Element;
@@ -37,18 +39,26 @@ import org.apache.tapestry5.dom.Element;
*/
public class FormGroup
{
-
@InjectContainer
private Field field;
private Element label;
+@Environmental
+private ValidationDecorator decorator;
+
void beginRender(MarkupWriter writer)
{
writer.element(div, class, form-group);
-label = writer.element(label);
+
+decorator.beforeLabel(field);
+
+label = writer.element(label, class, control-label);
writer.end();
+
fillInLabelAttributes();
+
+decorator.afterLabel(field);
}
@HeartbeatDeferred
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7171439c/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/GridTests.java
--
diff --git
a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/GridTests.java
b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/GridTests.java
index a4084b0..69bdbd1 100644
---
a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/GridTests.java
+++
b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/GridTests.java
@@ -16,11 +16,13 @@ package org.apache.tapestry5.integration.app1;
import org.apache.tapestry5.corelib.components.Grid;
import org.apache.tapestry5.integration.TapestryCoreTestCase;
+import org.apache.tapestry5.test.TapestryTestConfiguration;
import org.testng.annotations.Test;
/**
* Tests for the {@link Grid} component.
*/
+@TapestryTestConfiguration(webAppFolder = src/test/app1)
public class GridTests extends TapestryCoreTestCase
{
Git Push Summary
Updated Tags: refs/tags/5.4-alpha-15 [created] cd7f9c874 refs/tags/5.4-alpha-16 [created] 7171439c1
