You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2013/06/12 21:15:06 UTC
[3/4] git commit: Switch the Palette over to using just Glyphicons
for the buttons
Switch the Palette over to using just Glyphicons for the buttons
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/d30479a0
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/d30479a0
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/d30479a0
Branch: refs/heads/master
Commit: d30479a03d9cb4796cbb0fb19fa7ea5ba3316fed
Parents: a083f0c
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Tue Jun 11 08:16:25 2013 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Tue Jun 11 08:16:25 2013 -0700
----------------------------------------------------------------------
.../tapestry5/corelib/components/Palette.java | 20 +++++++++++--------
.../resources/META-INF/assets/core/deselect.png | Bin 1837 -> 0 bytes
.../META-INF/assets/core/move_down.png | Bin 1338 -> 0 bytes
.../resources/META-INF/assets/core/move_up.png | Bin 1319 -> 0 bytes
.../resources/META-INF/assets/core/select.png | Bin 1885 -> 0 bytes
.../tapestry5/corelib/components/Palette.tml | 8 ++++----
6 files changed, 16 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d30479a0/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java
index 5ea4fba..05c096d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java
@@ -23,6 +23,7 @@ import org.apache.tapestry5.internal.util.SelectModelRenderer;
import org.apache.tapestry5.ioc.annotations.Inject;
import org.apache.tapestry5.ioc.annotations.Symbol;
import org.apache.tapestry5.json.JSONArray;
+import org.apache.tapestry5.services.compatibility.DeprecationWarning;
import java.util.Collection;
@@ -74,8 +75,7 @@ public class Palette extends AbstractField
/**
* The image to use for the deselect button (the default is a left pointing arrow).
*/
- @Parameter(value = "asset:deselect.png")
- @Property(write = false)
+ @Parameter
private Asset deselect;
/**
@@ -112,22 +112,19 @@ public class Palette extends AbstractField
/**
* The image to use for the move down button (the default is a downward pointing arrow).
*/
- @Parameter(value = "asset:move_down.png")
- @Property(write = false)
+ @Parameter
private Asset moveDown;
/**
* The image to use for the move up button (the default is an upward pointing arrow).
*/
- @Parameter(value = "asset:move_up.png")
- @Property(write = false)
+ @Parameter
private Asset moveUp;
/**
* The image to use for the select button (the default is a right pointing arrow).
*/
- @Parameter(value = "asset:select.png")
- @Property(write = false)
+ @Parameter
private Asset select;
/**
@@ -172,6 +169,13 @@ public class Palette extends AbstractField
@Symbol(SymbolConstants.COMPACT_JSON)
private boolean compactJSON;
+ @Inject
+ private DeprecationWarning deprecationWarning;
+
+ void pageLoaded() {
+ deprecationWarning.ignoredComponentParameters(resources, "select", "moveUp", "moveDown", "deselect");
+ }
+
public final Renderable mainRenderer = new Renderable()
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d30479a0/tapestry-core/src/main/resources/META-INF/assets/core/deselect.png
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/resources/META-INF/assets/core/deselect.png b/tapestry-core/src/main/resources/META-INF/assets/core/deselect.png
deleted file mode 100644
index 97473a6..0000000
Binary files a/tapestry-core/src/main/resources/META-INF/assets/core/deselect.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d30479a0/tapestry-core/src/main/resources/META-INF/assets/core/move_down.png
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/resources/META-INF/assets/core/move_down.png b/tapestry-core/src/main/resources/META-INF/assets/core/move_down.png
deleted file mode 100644
index 1f5c72a..0000000
Binary files a/tapestry-core/src/main/resources/META-INF/assets/core/move_down.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d30479a0/tapestry-core/src/main/resources/META-INF/assets/core/move_up.png
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/resources/META-INF/assets/core/move_up.png b/tapestry-core/src/main/resources/META-INF/assets/core/move_up.png
deleted file mode 100644
index 05a447b..0000000
Binary files a/tapestry-core/src/main/resources/META-INF/assets/core/move_up.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d30479a0/tapestry-core/src/main/resources/META-INF/assets/core/select.png
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/resources/META-INF/assets/core/select.png b/tapestry-core/src/main/resources/META-INF/assets/core/select.png
deleted file mode 100644
index 78c78a4..0000000
Binary files a/tapestry-core/src/main/resources/META-INF/assets/core/select.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d30479a0/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/Palette.tml
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/Palette.tml b/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/Palette.tml
index 8b3b196..cff60a1 100644
--- a/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/Palette.tml
+++ b/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/Palette.tml
@@ -18,23 +18,23 @@
<div class="palette-controls">
<div>
<button data-action="select" class="btn" disabled="${disabledValue}">
- <img src="${select}" alt="${message:core-palette-select-label}"/>
+ <i class="icon-arrow-right"/>
</button>
</div>
<div>
<button data-action="deselect" class="btn" disabled="${disabledValue}">
- <img src="${deselect}" alt="${message:core-palette-deselect-label}"/>
+ <i class="icon-arrow-left"/>
</button>
</div>
<t:if test="reorder">
<div>
<button data-action="move-up" class="btn" disabled="${disabledValue}">
- <img src="${moveUp}" alt="${message:core-palette-up-label}"/>
+ <i class="icon-arrow-up"/>
</button>
</div>
<div>
<button data-action="move-down" class="btn" disabled="${disabledValue}">
- <img src="${moveDown}" alt="${message:core-palette-down-label}"/>
+ <i class="icon-arrow-down"/>
</button>
</div>
</t:if>