diff options
author | Valerio Virgillito | 2012-03-19 14:02:24 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-03-19 14:02:24 -0700 |
commit | e9c3c7d758fc59ad7b731730dd935170844d9538 (patch) | |
tree | 2972d0384605eef4ba1a43636bd48db724f15713 /js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | |
parent | cff7deb476f4095d7d3d76c92360617d3316a96f (diff) | |
parent | afe4b3d6567a35586e970682d71cba61c416e496 (diff) | |
download | ninja-e9c3c7d758fc59ad7b731730dd935170844d9538.tar.gz |
Merge branch 'refs/heads/master' into montage-integration
Diffstat (limited to 'js/panels/Materials/materials-library-panel.reel/materials-library-panel.html')
-rwxr-xr-x | js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | 42 |
1 files changed, 39 insertions, 3 deletions
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html index 6ba4ac75..fe17d0f8 100755 --- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html +++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html | |||
@@ -10,6 +10,42 @@ | |||
10 | <link rel="stylesheet" type="text/css" href="materials-library-panel.css"> | 10 | <link rel="stylesheet" type="text/css" href="materials-library-panel.css"> |
11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
12 | { | 12 | { |
13 | "addButton": { | ||
14 | "prototype": "montage/ui/button.reel", | ||
15 | "properties": { | ||
16 | "element": {"#": "ml_add_btn"} | ||
17 | }, | ||
18 | "listeners": [ | ||
19 | { | ||
20 | "type": "action", | ||
21 | "listener": {"@": "owner"} | ||
22 | } | ||
23 | ] | ||
24 | }, | ||
25 | "copyButton": { | ||
26 | "prototype": "montage/ui/button.reel", | ||
27 | "properties": { | ||
28 | "element": {"#": "ml_copy_btn"} | ||
29 | }, | ||
30 | "listeners": [ | ||
31 | { | ||
32 | "type": "action", | ||
33 | "listener": {"@": "owner"} | ||
34 | } | ||
35 | ] | ||
36 | }, | ||
37 | "deleteButton": { | ||
38 | "prototype": "montage/ui/button.reel", | ||
39 | "properties": { | ||
40 | "element": {"#": "ml_delete_btn"} | ||
41 | }, | ||
42 | "listeners": [ | ||
43 | { | ||
44 | "type": "action", | ||
45 | "listener": {"@": "owner"} | ||
46 | } | ||
47 | ] | ||
48 | }, | ||
13 | "materialInfo": { | 49 | "materialInfo": { |
14 | "module": "js/panels/Materials/materials-popup.reel", | 50 | "module": "js/panels/Materials/materials-popup.reel", |
15 | "name": "MaterialsPopup" | 51 | "name": "MaterialsPopup" |
@@ -34,9 +70,9 @@ | |||
34 | </div> | 70 | </div> |
35 | <hr /> | 71 | <hr /> |
36 | <div id="ml_buttons"> | 72 | <div id="ml_buttons"> |
37 | <button id="ml_add_btn">Add</button> | 73 | <button id="ml_add_btn" class="nj-skinned">Add</button> |
38 | <button id="ml_copy_btn">Copy</button> | 74 | <button id="ml_copy_btn" class="nj-skinned">Copy</button> |
39 | <button id="ml_delete_btn">Delete</button> | 75 | <button id="ml_delete_btn" class="nj-skinned">Delete</button> |
40 | </div> | 76 | </div> |
41 | </div> | 77 | </div> |
42 | 78 | ||