diff options
author | Valerio Virgillito | 2012-05-16 16:06:56 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-16 16:06:56 -0700 |
commit | 92fcb770aff434e994e7a39a61d8fac4a017dca0 (patch) | |
tree | e385beee8f2694596f6305bf90eb7eb4521de2e2 /js/components/tools-properties/selection-properties.reel/selection-properties.html | |
parent | bdd4b24c9e738c65ab8f6f9942358c59fe60edf1 (diff) | |
parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
download | ninja-92fcb770aff434e994e7a39a61d8fac4a017dca0.tar.gz |
Merge branch 'refs/heads/master' into dom-architecture
Conflicts:
js/document/templates/montage-html/package.json
js/io/system/ninjalibrary.json
node_modules/descriptor.json
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/components/tools-properties/selection-properties.reel/selection-properties.html')
-rwxr-xr-x | js/components/tools-properties/selection-properties.reel/selection-properties.html | 71 |
1 files changed, 53 insertions, 18 deletions
diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.html b/js/components/tools-properties/selection-properties.reel/selection-properties.html index b93aacd0..3dd04f2c 100755 --- a/js/components/tools-properties/selection-properties.reel/selection-properties.html +++ b/js/components/tools-properties/selection-properties.reel/selection-properties.html | |||
@@ -16,31 +16,66 @@ | |||
16 | "prototype": "js/components/tools-properties/selection-properties.reel", | 16 | "prototype": "js/components/tools-properties/selection-properties.reel", |
17 | "properties": { | 17 | "properties": { |
18 | "element": {"#": "selectionProperties"}, | 18 | "element": {"#": "selectionProperties"}, |
19 | "transform": {"#": "transformCheck"} | 19 | "transform": {"#": "transformCheck"}, |
20 | |||
21 | "topAlign": {"#": "topAlignBtn"}, | ||
22 | "middleAlign": {"#": "middleAlignBtn"}, | ||
23 | "bottomAlign": {"#": "bottomAlignBtn"}, | ||
24 | |||
25 | "leftAlign": {"#": "leftAlignBtn"}, | ||
26 | "centerAlign": {"#": "centerAlignBtn"}, | ||
27 | "rightAlign": {"#": "rightAlignBtn"}, | ||
28 | |||
29 | "distTop": {"#": "distTopBtn"}, | ||
30 | "distMiddle": {"#": "distMiddleBtn"}, | ||
31 | "distBottom": {"#": "distBottomBtn"}, | ||
32 | |||
33 | "distLeft": {"#": "distLeftBtn"}, | ||
34 | "distCenter": {"#": "distCenterBtn"}, | ||
35 | "distRight": {"#": "distRightBtn"}, | ||
36 | |||
37 | "arrangeBringForward": {"#": "arrangeBringForwardBtn"}, | ||
38 | "arrangeSendBackward": {"#": "arrangeSendBackwardBtn"}, | ||
39 | "arrangeBringToFront": {"#": "arrangeBringToFrontBtn"}, | ||
40 | "arrangeSendToBack": {"#": "arrangeSendToBackBtn"} | ||
20 | } | 41 | } |
21 | } | 42 | } |
22 | } | 43 | } |
23 | </script> | 44 | </script> |
24 | 45 | ||
25 | </head> | 46 | </head> |
26 | 47 | ||
27 | <body> | 48 | <body> |
28 | <div data-montage-id="selectionProperties" class="subToolHolderPanel"> | 49 | <div data-montage-id="selectionProperties" class="subToolHolderPanel optionsSelectionTool toolOptionsFloatChildren"> |
29 | <label class="label subOption optionLabel"><input data-montage-id="transformCheck" type="checkbox" name="transformControl" class="checkBoxAlign"/>Transform Controls</label> | 50 | <input data-montage-id="transformCheck" type="checkbox" name="transformControl" class="nj-skinned"/> |
30 | <div id="toolPropertiesPanel-selectionDivOptions"> | 51 | <label class="label">Transform Control</label> |
31 | <div class="subOption"><div id="topAlign" class="topAlignUp" title="Top Align"></div></div> | 52 | <div class="toolOptionsSpacer"> </div> |
32 | <div class="subOption"><div id="rightAlign" class="rightAlignUp" title="Right Align"></div></div> | 53 | |
33 | <div class="subOption"><div id="bottomAlign" class="bottomAlignUp" title="Bottom Align"></div></div> | 54 | <button data-montage-id="topAlignBtn" class="nj-skinned" role="button"><div id="topAlign" class="selectionToolIcon alignTopIcon" title="Align Top"/></button> |
34 | <div class="subOption"><div id="vLeft" class="verticalLeftUp" title="Vertical Left"></div></div> | 55 | <button data-montage-id="middleAlignBtn" class="nj-skinned" role="button"><div id="middleAlign" class="selectionToolIcon alignMiddleIcon" title="Align Vertical Center"/></button> |
35 | <div class="subOption"><div id="vRight" class="verticalRightUp" title="Vertical Right"></div></div> | 56 | <button data-montage-id="bottomAlignBtn" class="nj-skinned" role="button"><div id="bottomAlign" class="selectionToolIcon alignBottomIcon" title="Align Bottom"></button> |
36 | <div class="subOption"><div id="vCenter" class="verticalCenterUp" title="Vertical Center"></div></div> | 57 | <div class="toolOptionsSpacer"> </div> |
37 | <div class="subOption"><div id="distTop" class="distTopUp" title="Distance Top"></div></div> | 58 | |
38 | <div class="subOption"><div id="distCenter" class="distCenterUp" title="Distance Center"></div></div> | 59 | <button data-montage-id="leftAlignBtn" class="nj-skinned" role="button"><div id="leftAlign" class="selectionToolIcon alignLeftIcon" title="Align Left"/></button> |
39 | <div class="subOption"><div id="distBottom" class="distBottomUp" title="Distance Bottom"></div></div> | 60 | <button data-montage-id="centerAlignBtn" class="nj-skinned" role="button"><div id="centerAlign" class="selectionToolIcon alignCenterIcon" title="Align Horizontal Center"/></button> |
40 | <div class="subOption"><div id="distLeft" class="distLeftUp" title="Distance Left"></div></div> | 61 | <button data-montage-id="rightAlignBtn" class="nj-skinned" role="button"><div id="rightAlign" class="selectionToolIcon alignRightIcon" title="Align Right"/></button> |
41 | <div class="subOption"><div id="distVCenter" class="distVCenterUp" title="Distance Center"></div></div> | 62 | <div class="toolOptionsSpacer"> </div> |
42 | <div class="subOption"><div id="distRight" class="distRightUp" title="Distance Right"></div></div> | 63 | |
43 | </div> | 64 | <button data-montage-id="distTopBtn" class="nj-skinned" role="button"><div id="distTop" class="selectionToolIcon distTopIcon" title="Distribute Top"/></button> |
65 | <button data-montage-id="distMiddleBtn" class="nj-skinned" role="button"><div id="distMiddle" class="selectionToolIcon distMiddleIcon" title="Distribute Vertical Center"/></button> | ||
66 | <button data-montage-id="distBottomBtn" class="nj-skinned" role="button"><div id="distBottom" class="selectionToolIcon distBottomIcon" title="Distribute Bottom"/></button> | ||
67 | <div class="toolOptionsSpacer"> </div> | ||
68 | |||
69 | <button data-montage-id="distLeftBtn" class="nj-skinned" role="button"><div id="distLeft" class="selectionToolIcon distLeftIcon" title="Distribute Left"/></button> | ||
70 | <button data-montage-id="distCenterBtn" class="nj-skinned" role="button"><div id="distCenter" class="selectionToolIcon distCenterIcon" title="Distribute Horizontal Center"/></button> | ||
71 | <button data-montage-id="distRightBtn" class="nj-skinned" role="button"><div id="distRight" class="selectionToolIcon distRightIcon" title="Distribute Right"/></button> | ||
72 | <div class="toolOptionsSpacer"> </div> | ||
73 | |||
74 | <button data-montage-id="arrangeBringForwardBtn" class="nj-skinned" role="button"><div id="arrangeBringForward" class="selectionToolIcon arrangeBringForwardIcon" title="Bring Forward"/></button> | ||
75 | <button data-montage-id="arrangeSendBackwardBtn" class="nj-skinned" role="button"><div id="arrangeSendBackward" class="selectionToolIcon arrangeSendBackwardIcon" title="Send Backward"/></button> | ||
76 | <button data-montage-id="arrangeBringToFrontBtn" class="nj-skinned" role="button"><div id="arrangeBringToFront" class="selectionToolIcon arrangeBringToFrontIcon" title="Bring To Front"/></button> | ||
77 | <button data-montage-id="arrangeSendToBackBtn" class="nj-skinned" role="button"><div id="arrangeSendToBack" class="selectionToolIcon arrangeSendToBackIcon" title="Send To Back"/></button> | ||
78 | |||
44 | </div> | 79 | </div> |
45 | </body> | 80 | </body> |
46 | 81 | ||