aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials/materials-popup.reel/materials-popup.html
diff options
context:
space:
mode:
authorhwc4872012-07-09 16:08:02 -0700
committerhwc4872012-07-09 16:08:02 -0700
commit5085d0f67df89a21715308956004164597a6ba79 (patch)
tree2c896163143a66331205a39b0a3b1b45d51bf12a /js/panels/Materials/materials-popup.reel/materials-popup.html
parent51f1691f792dbda9b740ded8aa0457c9406db156 (diff)
parent84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
downloadninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts: js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/panels/Materials/materials-popup.reel/materials-popup.html')
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.html46
1 files changed, 34 insertions, 12 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..ac8f0a94 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.html
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility, Inc
4All Rights Reserved. 4All Rights Reserved.
@@ -29,13 +29,13 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29POSSIBILITY OF SUCH DAMAGE. 29POSSIBILITY OF SUCH DAMAGE.
30</copyright> --> 30</copyright> -->
31<html lang="en"> 31<html lang="en">
32 <head> 32 <head>
33 33
34 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 34 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
35 35
36 <link rel="stylesheet" type="text/css" href="materials-popup.css"> 36 <link rel="stylesheet" type="text/css" href="materials-popup.css">
37 37
38 <script type="text/montage-serialization"> 38 <script type="text/montage-serialization">
39 { 39 {
40 "okButton": { 40 "okButton": {
41 "prototype": "montage/ui/button.reel", 41 "prototype": "montage/ui/button.reel",
@@ -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,28 +118,35 @@ 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 }
110 </script> 128 </script>
111 129
112 </head> 130 </head>
113 131
114 <body> 132 <body>
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>
130</html> 152</html>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 02:51:05 +0000