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/23 03:19:52 UTC
[12/35] git commit: Update the Palette component for Bootstrap 3
Update the Palette component for 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/778a344d
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/778a344d
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/778a344d
Branch: refs/heads/master
Commit: 778a344db8922be4d0f15deb7ebaccb3b529041d
Parents: 06b7c16
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Thu Aug 22 15:53:19 2013 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Thu Aug 22 15:53:19 2013 -0700
----------------------------------------------------------------------
.../tapestry5/corelib/components/Palette.tml | 38 +++++++++-----------
1 file changed, 16 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/778a344d/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 bdf009a..f408a79 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
@@ -15,28 +15,20 @@
</select>
</div>
- <div class="palette-controls">
- <div>
- <button data-action="select" class="btn" disabled="${disabledValue}">
- <i class="icon-arrow-right"/>
+ <div class="btn-group-vertical palette-controls">
+ <button data-action="select" class="btn btn-default" disabled="${disabledValue}">
+ <t:glyphicon name="arrow-right"/>
+ </button>
+ <button data-action="deselect" class="btn btn-default" disabled="${disabledValue}">
+ <t:glyphicon name="arrow-left"/>
+ </button>
+ <t:if test="reorder">
+ <button data-action="move-up" class="btn btn-default" disabled="${disabledValue}">
+ <t:glyphicon name="arrow-up"/>
</button>
- </div>
- <div>
- <button data-action="deselect" class="btn" disabled="${disabledValue}">
- <i class="icon-arrow-left"/>
+ <button data-action="move-down" class="btn btn-default" disabled="${disabledValue}">
+ <t:glyphicon name="arrow-down"/>
</button>
- </div>
- <t:if test="reorder">
- <div>
- <button data-action="move-up" class="btn" disabled="${disabledValue}">
- <i class="icon-arrow-up"/>
- </button>
- </div>
- <div>
- <button data-action="move-down" class="btn" disabled="${disabledValue}">
- <i class="icon-arrow-down"/>
- </button>
- </div>
</t:if>
</div>
<div class="palette-selected">
@@ -44,9 +36,11 @@
<t:delegate to="selectedLabel"/>
</div>
<t:remove>
- data-value=mode="options" is a bit of hack to inform the client side that the value for the field is all options, selected or not. This is used by validation logic.
+ data-value=mode="options" is a bit of hack to inform the client side that the value for the field is all
+ options, selected or not. This is used by validation logic.
</t:remove>
- <select t:type="any" t:id="selected" id="${clientId}" multiple="multiple" size="${size}" disabled="${disabledValue}" data-value-mode="options" t:mixins="rendernotification">
+ <select t:type="any" t:id="selected" id="${clientId}" multiple="multiple" size="${size}"
+ disabled="${disabledValue}" data-value-mode="options" t:mixins="rendernotification">
<t:remove>Starts empty, populated on the client side.</t:remove>
</select>
</div>