aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials/materials-popup.reel/materials-popup.html
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 12:15:26 -0700
committerValerio Virgillito2012-07-09 12:15:26 -0700
commit1839f24e8dcbad38d1381bbcd65c17a9caa45987 (patch)
tree516a29ca99d4aae0d5228223fff438c1a3c4e0d3 /js/panels/Materials/materials-popup.reel/materials-popup.html
parentaedd14b18695d031f695d27dfbd94df5614495bb (diff)
parentfebfdb18042d1c73ac58ee4e35c5f176428dee00 (diff)
downloadninja-1839f24e8dcbad38d1381bbcd65c17a9caa45987.tar.gz
Merge pull request #346 from mqg734/MaterialsUI
UI support for preview, edit, duplicate and delete of WebGL Materials.
Diffstat (limited to 'js/panels/Materials/materials-popup.reel/materials-popup.html')
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.html26
1 files changed, 24 insertions, 2 deletions
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html
index b377fa2d..db53e0e9 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.html
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.html
@@ -51,6 +51,21 @@ POSSIBILITY OF SUCH DAMAGE.
51 "label": "Cancel" 51 "label": "Cancel"
52 } 52 }
53 }, 53 },
54 "saveAsButton": {
55 "prototype": "montage/ui/button.reel",
56 "properties": {
57 "element": {"#": "mp_saveAs_btn"},
58 "label": "Save As..."
59 }
60 },
61 "resetButton": {
62 "prototype": "montage/ui/button.reel",
63 "properties": {
64 "element": {"#": "mp_reset_btn"},
65 "label": "Reset",
66 "enabled": false
67 }
68 },
54 "eventDelegator": { 69 "eventDelegator": {
55 "prototype": "montage/core/event/action-event-listener", 70 "prototype": "montage/core/event/action-event-listener",
56 "properties": { 71 "properties": {
@@ -103,7 +118,10 @@ POSSIBILITY OF SUCH DAMAGE.
103 "element": {"#": "materials_popup"}, 118 "element": {"#": "materials_popup"},
104 "okButton": {"@": "okButton"}, 119 "okButton": {"@": "okButton"},
105 "cancelButton": {"@": "cancelButton"}, 120 "cancelButton": {"@": "cancelButton"},
106 "materialTitle": {"#": "mp_title"} 121 "saveAsButton": {"@": "saveAsButton"},
122 "resetButton": {"@": "resetButton"},
123 "materialTitle": {"#": "mp_title"},
124 "previewCanvas": {"#": "mp_preview_canvas"}
107 } 125 }
108 } 126 }
109 } 127 }
@@ -115,15 +133,19 @@ POSSIBILITY OF SUCH DAMAGE.
115 <div data-montage-id="materials_popup" class="materials_popup"> 133 <div data-montage-id="materials_popup" class="materials_popup">
116 <div data-montage-id="mp_title" class="mp_title">Material Name</div> 134 <div data-montage-id="mp_title" class="mp_title">Material Name</div>
117 <hr /> 135 <hr />
118 <div data-montage-id="mp_preview" class="mp_preview">Preview Pane</div> 136 <div data-montage-id="mp_preview" class="mp_preview">
137 <canvas data-montage-id="mp_preview_canvas" width="200" height="100"/>
138 </div>
119 <hr /> 139 <hr />
120 <div data-montage-id="mp_properties_list" class="mp_properties_list"> 140 <div data-montage-id="mp_properties_list" class="mp_properties_list">
121 <div data-montage-id="mp_property" class="mp_property"></div> 141 <div data-montage-id="mp_property" class="mp_property"></div>
122 </div> 142 </div>
143 <button data-montage-id="mp_reset_btn" class="mp_reset_btn nj-skinned"></button>
123 <hr /> 144 <hr />
124 <div data-montage-id="mp_buttons" class="mp_buttons"> 145 <div data-montage-id="mp_buttons" class="mp_buttons">
125 <button data-montage-id="mp_cancel_btn" class="mp_cancel_btn nj-skinned"></button> 146 <button data-montage-id="mp_cancel_btn" class="mp_cancel_btn nj-skinned"></button>
126 <button data-montage-id="mp_ok_btn" class="mp_ok_btn nj-skinned"></button> 147 <button data-montage-id="mp_ok_btn" class="mp_ok_btn nj-skinned"></button>
148 <button data-montage-id="mp_saveAs_btn" class="mp_saveAs_btn nj-skinned"></button>
127 </div> 149 </div>
128 </div> 150 </div>
129 </body> 151 </body>