diff options
author | Eric Guzman | 2012-03-12 15:33:04 -0700 |
---|---|---|
committer | Eric Guzman | 2012-03-12 15:33:04 -0700 |
commit | 7e3161153b87b891875ac65368a19aed12909fa3 (patch) | |
tree | b80f48d711a9729fc39dbbdff28c4f0620e7302d /js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html | |
parent | 7a28932ba8a7517bbaaabe1f5edf678416aafc9c (diff) | |
parent | 69d90467865a1384725b2301901be2180c5a841f (diff) | |
download | ninja-7e3161153b87b891875ac65368a19aed12909fa3.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
Diffstat (limited to 'js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html')
-rwxr-xr-x | js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html new file mode 100755 index 00000000..be4ae431 --- /dev/null +++ b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html | |||
@@ -0,0 +1,67 @@ | |||
1 | <!DOCTYPE html> | ||
2 | <!-- <copyright> | ||
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
6 | </copyright> --> | ||
7 | <html lang="en"> | ||
8 | <head> | ||
9 | <script type="text/montage-serialization"> | ||
10 | { | ||
11 | "owner": { | ||
12 | "module" : "js/panels/properties.reel/sections/custom-rows/dual-row.reel", | ||
13 | "name" : "DualRow", | ||
14 | "properties" : { | ||
15 | "element" : {"#": "section"}, | ||
16 | "slot" : {"@": "slot"}, | ||
17 | "slot2" : {"@": "slot2"} | ||
18 | } | ||
19 | }, | ||
20 | "slot": { | ||
21 | "module": "montage/ui/slot.reel", | ||
22 | "name": "Slot", | ||
23 | "properties": { | ||
24 | "element": { "#": "slotElement" } | ||
25 | }, | ||
26 | "bindings": { | ||
27 | "content" : { | ||
28 | "boundObject": {"@": "owner"}, | ||
29 | "boundObjectPropertyPath": "content" | ||
30 | } | ||
31 | } | ||
32 | }, | ||
33 | "slot2": { | ||
34 | "module": "montage/ui/slot.reel", | ||
35 | "name": "Slot", | ||
36 | "properties": { | ||
37 | "element": { "#": "slotElement2" } | ||
38 | }, | ||
39 | "bindings": { | ||
40 | "content" : { | ||
41 | "boundObject": {"@": "owner"}, | ||
42 | "boundObjectPropertyPath": "content2" | ||
43 | } | ||
44 | } | ||
45 | } | ||
46 | } | ||
47 | </script> | ||
48 | </head> | ||
49 | <body> | ||
50 | <div id="section"> | ||
51 | <section class="fieldCol"> | ||
52 | <label class="lbl"></label> | ||
53 | <article class="fieldRow"> | ||
54 | <div id="slotElement" class="inputField"> | ||
55 | |||
56 | </div> | ||
57 | </article> | ||
58 | <label class="lbl"></label> | ||
59 | <article class="fieldRow"> | ||
60 | <div id="slotElement2" class="inputField"> | ||
61 | |||
62 | </div> | ||
63 | </article> | ||
64 | </section> | ||
65 | </div> | ||
66 | </body> | ||
67 | </html> \ No newline at end of file | ||