You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2013/08/24 00:10:05 UTC
[1/5] git commit: Remove class="control-label" (not used in Bootstrap
3)
Updated Branches:
refs/heads/master 360439e09 -> 6ef638659
Remove class="control-label" (not used in 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/e07a3a47
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/e07a3a47
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/e07a3a47
Branch: refs/heads/master
Commit: e07a3a47fb89f34bd1004992373998a0787c25b3
Parents: 360439e
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Fri Aug 23 15:02:19 2013 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Fri Aug 23 15:02:19 2013 -0700
----------------------------------------------------------------------
.../org/apache/tapestry5/corelib/components/Label.java | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/e07a3a47/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 f88b7e1..d479d05 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
@@ -60,20 +60,11 @@ public class Label
private Element labelElement;
- /**
- * CSS class name(s) for the Label.
- *
- * @since 5.4
- */
- @Parameter(name = "class", defaultPrefix = BindingConstants.LITERAL, value = "control-label")
- private String className;
-
-
boolean beginRender(MarkupWriter writer)
{
decorator.beforeLabel(field);
- labelElement = writer.element("label", "class", className);
+ labelElement = writer.element("label");
resources.renderInformalParameters(writer);
[4/5] git commit: Fix the positioning of the DateField's popup
Posted by hl...@apache.org.
Fix the positioning of the DateField's popup
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/b3259538
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/b3259538
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/b3259538
Branch: refs/heads/master
Commit: b3259538792cb8ce365c16fae0df0050800c4183
Parents: 289a2d2
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Fri Aug 23 15:09:35 2013 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Fri Aug 23 15:09:35 2013 -0700
----------------------------------------------------------------------
.../META-INF/modules/t5/core/datefield.coffee | 4 ++--
.../META-INF/assets/tapestry5/tapestry.css | 17 ++++++++++-------
2 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b3259538/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 84b1ac7..a1b1bfd 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,8 +114,8 @@ define ["./dom", "./events", "./messages", "./ajax", "underscore", "./fields"],
createPopup: ->
@datePicker = new DatePicker()
@datePicker.setFirstWeekDay datePickerFirstDay
- @popup = dom.create().append @datePicker.create()
- @container.append @popup
+ @popup = dom.create("div", { class: "datefield-popup"}).append @datePicker.create()
+ @container.insertAfter @popup
@datePicker.onselect = _.bind @onSelect, this
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b3259538/tapestry-core/src/main/resources/META-INF/assets/tapestry5/tapestry.css
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/tapestry.css b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/tapestry.css
index e0486b5..373beae 100644
--- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/tapestry.css
+++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/tapestry.css
@@ -1,9 +1,3 @@
-div.t-datefield-popup {
- position: absolute;
- z-index: 1000;
- margin-top: 2px;
-}
-
/* Applied to an input element to provide feedback that something is waiting on an Ajax request:
examples include server-side validation, or autocompletion. An Ajax "throbber" is displayed
on the right side of the field. */
@@ -26,4 +20,13 @@ th[data-grid-column-sort=ascending] a {
th[data-grid-column-sort=descending] a {
background-image: url(../core/sort-desc.png);
-}
\ No newline at end of file
+}
+
+/* Some support for the built-in DateField component. */
+
+div.datefield-popup {
+ position: absolute;
+ z-index: 1000;
+ margin-top: 2px;
+}
+
[5/5] git commit: Fix a number of tests
Posted by hl...@apache.org.
Fix a number of tests
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/6ef63865
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/6ef63865
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/6ef63865
Branch: refs/heads/master
Commit: 6ef638659368dd2c0920a2f770953d0ed69eb6fe
Parents: b325953
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Fri Aug 23 15:09:58 2013 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Fri Aug 23 15:09:58 2013 -0700
----------------------------------------------------------------------
.../org/apache/tapestry5/integration/app1/AlertsTests.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6ef63865/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AlertsTests.groovy
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AlertsTests.groovy b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AlertsTests.groovy
index 87f4c3c..c35055b 100644
--- a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AlertsTests.groovy
+++ b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AlertsTests.groovy
@@ -100,7 +100,7 @@ class AlertsTests extends TapestryCoreTestCase {
assertTextPresent "ajax error until"
- click "css=$CONTAINER .btn.btn-mini"
+ click "css=$CONTAINER [data-action='dismiss-all']"
// Check that the alert container is now empty
[2/5] git commit: Update copyright
Posted by hl...@apache.org.
Update copyright
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/e7b7d810
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/e7b7d810
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/e7b7d810
Branch: refs/heads/master
Commit: e7b7d810689866808cca2ff09b9a8678201c40c1
Parents: e07a3a4
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Fri Aug 23 15:02:37 2013 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Fri Aug 23 15:02:37 2013 -0700
----------------------------------------------------------------------
.../main/java/org/apache/tapestry5/corelib/components/Label.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/e7b7d810/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 d479d05..7bb9f4a 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
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 The Apache Software Foundation
+// Copyright 2006-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.
[3/5] git commit: Restore the around the alert content,
needed by tests
Posted by hl...@apache.org.
Restore the <span> around the alert content, needed by tests
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/289a2d24
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/289a2d24
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/289a2d24
Branch: refs/heads/master
Commit: 289a2d2421bb1136174083c42cd8bf5b487a6cf3
Parents: e7b7d81
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Fri Aug 23 15:09:08 2013 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Fri Aug 23 15:09:08 2013 -0700
----------------------------------------------------------------------
.../src/main/coffeescript/META-INF/modules/t5/core/alert.coffee | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/289a2d24/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/alert.coffee
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/alert.coffee b/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/alert.coffee
index 3ac723d..2d2da61 100644
--- a/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/alert.coffee
+++ b/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/alert.coffee
@@ -119,8 +119,8 @@ define ["./dom", "./console", "./messages", "./ajax", "underscore", "./bootstrap
class: "alert alert-dismissable " + className
"""
<button type="button" class="close">×</button>
- #{content}
- """
+ <span>#{content}</span>
+ """
container.append element
[3/5] git commit: Restore the around the alert content,
needed by tests
Posted by hl...@apache.org.
Restore the <span> around the alert content, needed by tests
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/289a2d24
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/289a2d24
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/289a2d24
Branch: refs/heads/master
Commit: 289a2d2421bb1136174083c42cd8bf5b487a6cf3
Parents: e7b7d81
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Fri Aug 23 15:09:08 2013 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Fri Aug 23 15:09:08 2013 -0700
----------------------------------------------------------------------
.../src/main/coffeescript/META-INF/modules/t5/core/alert.coffee | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/289a2d24/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/alert.coffee
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/alert.coffee b/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/alert.coffee
index 3ac723d..2d2da61 100644
--- a/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/alert.coffee
+++ b/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/alert.coffee
@@ -119,8 +119,8 @@ define ["./dom", "./console", "./messages", "./ajax", "underscore", "./bootstrap
class: "alert alert-dismissable " + className
"""
<button type="button" class="close">×</button>
- #{content}
- """
+ <span>#{content}</span>
+ """
container.append element
[4/5] git commit: Fix the positioning of the DateField's popup
Posted by hl...@apache.org.
Fix the positioning of the DateField's popup
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/b3259538
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/b3259538
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/b3259538
Branch: refs/heads/master
Commit: b3259538792cb8ce365c16fae0df0050800c4183
Parents: 289a2d2
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Fri Aug 23 15:09:35 2013 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Fri Aug 23 15:09:35 2013 -0700
----------------------------------------------------------------------
.../META-INF/modules/t5/core/datefield.coffee | 4 ++--
.../META-INF/assets/tapestry5/tapestry.css | 17 ++++++++++-------
2 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b3259538/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 84b1ac7..a1b1bfd 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,8 +114,8 @@ define ["./dom", "./events", "./messages", "./ajax", "underscore", "./fields"],
createPopup: ->
@datePicker = new DatePicker()
@datePicker.setFirstWeekDay datePickerFirstDay
- @popup = dom.create().append @datePicker.create()
- @container.append @popup
+ @popup = dom.create("div", { class: "datefield-popup"}).append @datePicker.create()
+ @container.insertAfter @popup
@datePicker.onselect = _.bind @onSelect, this
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b3259538/tapestry-core/src/main/resources/META-INF/assets/tapestry5/tapestry.css
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/tapestry.css b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/tapestry.css
index e0486b5..373beae 100644
--- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/tapestry.css
+++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/tapestry.css
@@ -1,9 +1,3 @@
-div.t-datefield-popup {
- position: absolute;
- z-index: 1000;
- margin-top: 2px;
-}
-
/* Applied to an input element to provide feedback that something is waiting on an Ajax request:
examples include server-side validation, or autocompletion. An Ajax "throbber" is displayed
on the right side of the field. */
@@ -26,4 +20,13 @@ th[data-grid-column-sort=ascending] a {
th[data-grid-column-sort=descending] a {
background-image: url(../core/sort-desc.png);
-}
\ No newline at end of file
+}
+
+/* Some support for the built-in DateField component. */
+
+div.datefield-popup {
+ position: absolute;
+ z-index: 1000;
+ margin-top: 2px;
+}
+
[5/5] git commit: Fix a number of tests
Posted by hl...@apache.org.
Fix a number of tests
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/6ef63865
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/6ef63865
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/6ef63865
Branch: refs/heads/master
Commit: 6ef638659368dd2c0920a2f770953d0ed69eb6fe
Parents: b325953
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Fri Aug 23 15:09:58 2013 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Fri Aug 23 15:09:58 2013 -0700
----------------------------------------------------------------------
.../org/apache/tapestry5/integration/app1/AlertsTests.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6ef63865/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AlertsTests.groovy
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AlertsTests.groovy b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AlertsTests.groovy
index 87f4c3c..c35055b 100644
--- a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AlertsTests.groovy
+++ b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/AlertsTests.groovy
@@ -100,7 +100,7 @@ class AlertsTests extends TapestryCoreTestCase {
assertTextPresent "ajax error until"
- click "css=$CONTAINER .btn.btn-mini"
+ click "css=$CONTAINER [data-action='dismiss-all']"
// Check that the alert container is now empty
[2/5] git commit: Update copyright
Posted by hl...@apache.org.
Update copyright
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/e7b7d810
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/e7b7d810
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/e7b7d810
Branch: refs/heads/master
Commit: e7b7d810689866808cca2ff09b9a8678201c40c1
Parents: e07a3a4
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Fri Aug 23 15:02:37 2013 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Fri Aug 23 15:02:37 2013 -0700
----------------------------------------------------------------------
.../main/java/org/apache/tapestry5/corelib/components/Label.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/e7b7d810/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 d479d05..7bb9f4a 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
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 The Apache Software Foundation
+// Copyright 2006-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.