aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials/materials-popup.reel/materials-popup.html
diff options
context:
space:
mode:
authorJohn Mayhew2012-07-09 17:28:24 -0700
committerJohn Mayhew2012-07-09 17:28:24 -0700
commit770bcb52422742ff741a88a75ecefbeb90bc9247 (patch)
tree64cb3e09a8daeb340261dd7f3869c73f7b90b643 /js/panels/Materials/materials-popup.reel/materials-popup.html
parent8c5ecaf90062f9e030386f338bdc19fd62b826c8 (diff)
parent2b2b5fbb4b6a786daa4e9d4ee9eba9ac78924842 (diff)
downloadninja-770bcb52422742ff741a88a75ecefbeb90bc9247.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Conflicts: manifest.json
Diffstat (limited to 'js/panels/Materials/materials-popup.reel/materials-popup.html')
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.html69
1 files changed, 46 insertions, 23 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..e1bb8d8b 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.html
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.html
@@ -1,25 +1,26 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility LLC.
4All Rights Reserved. 4All Rights Reserved.
5BSD License.
6 5
7Redistribution and use in source and binary forms, with or without 6Redistribution and use in source and binary forms, with or without
8modification, are permitted provided that the following conditions are met: 7modification, are permitted provided that the following conditions are met:
9 8
10 - Redistributions of source code must retain the above copyright notice, 9* Redistributions of source code must retain the above copyright notice,
11 this list of conditions and the following disclaimer. 10 this list of conditions and the following disclaimer.
12 - Redistributions in binary form must reproduce the above copyright 11
13 notice, this list of conditions and the following disclaimer in the 12* Redistributions in binary form must reproduce the above copyright notice,
14 documentation and/or other materials provided with the distribution. 13 this list of conditions and the following disclaimer in the documentation
15 - Neither the name of Motorola Mobility nor the names of its contributors 14 and/or other materials provided with the distribution.
16 may be used to endorse or promote products derived from this software 15
17 without specific prior written permission. 16* Neither the name of Motorola Mobility LLC nor the names of its
17 contributors may be used to endorse or promote products derived from this
18 software without specific prior written permission.
18 19
19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 20THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 21AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 22IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 23ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 24LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 25CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 26SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -29,13 +30,13 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29POSSIBILITY OF SUCH DAMAGE. 30POSSIBILITY OF SUCH DAMAGE.
30</copyright> --> 31</copyright> -->
31<html lang="en"> 32<html lang="en">
32 <head> 33 <head>
33 34
34 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 35 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
35 36
36 <link rel="stylesheet" type="text/css" href="materials-popup.css"> 37 <link rel="stylesheet" type="text/css" href="materials-popup.css">
37 38
38 <script type="text/montage-serialization"> 39 <script type="text/montage-serialization">
39 { 40 {
40 "okButton": { 41 "okButton": {
41 "prototype": "montage/ui/button.reel", 42 "prototype": "montage/ui/button.reel",
@@ -51,6 +52,21 @@ POSSIBILITY OF SUCH DAMAGE.
51 "label": "Cancel" 52 "label": "Cancel"
52 } 53 }
53 }, 54 },
55 "saveAsButton": {
56 "prototype": "montage/ui/button.reel",
57 "properties": {
58 "element": {"#": "mp_saveAs_btn"},
59 "label": "Save As..."
60 }
61 },
62 "resetButton": {
63 "prototype": "montage/ui/button.reel",
64 "properties": {
65 "element": {"#": "mp_reset_btn"},
66 "label": "Reset",
67 "enabled": false
68 }
69 },
54 "eventDelegator": { 70 "eventDelegator": {
55 "prototype": "montage/core/event/action-event-listener", 71 "prototype": "montage/core/event/action-event-listener",
56 "properties": { 72 "properties": {
@@ -103,28 +119,35 @@ POSSIBILITY OF SUCH DAMAGE.
103 "element": {"#": "materials_popup"}, 119 "element": {"#": "materials_popup"},
104 "okButton": {"@": "okButton"}, 120 "okButton": {"@": "okButton"},
105 "cancelButton": {"@": "cancelButton"}, 121 "cancelButton": {"@": "cancelButton"},
106 "materialTitle": {"#": "mp_title"} 122 "saveAsButton": {"@": "saveAsButton"},
123 "resetButton": {"@": "resetButton"},
124 "materialTitle": {"#": "mp_title"},
125 "previewCanvas": {"#": "mp_preview_canvas"}
107 } 126 }
108 } 127 }
109 } 128 }
110 </script> 129 </script>
111 130
112 </head> 131 </head>
113 132
114 <body> 133 <body>
115 <div data-montage-id="materials_popup" class="materials_popup"> 134 <div data-montage-id="materials_popup" class="materials_popup">
116 <div data-montage-id="mp_title" class="mp_title">Material Name</div> 135 <div data-montage-id="mp_title" class="mp_title">Material Name</div>
117 <hr /> 136 <hr />
118 <div data-montage-id="mp_preview" class="mp_preview">Preview Pane</div> 137 <div data-montage-id="mp_preview" class="mp_preview">
138 <canvas data-montage-id="mp_preview_canvas" width="200" height="100"/>
139 </div>
119 <hr /> 140 <hr />
120 <div data-montage-id="mp_properties_list" class="mp_properties_list"> 141 <div data-montage-id="mp_properties_list" class="mp_properties_list">
121 <div data-montage-id="mp_property" class="mp_property"></div> 142 <div data-montage-id="mp_property" class="mp_property"></div>
122 </div> 143 </div>
144 <button data-montage-id="mp_reset_btn" class="mp_reset_btn nj-skinned"></button>
123 <hr /> 145 <hr />
124 <div data-montage-id="mp_buttons" class="mp_buttons"> 146 <div data-montage-id="mp_buttons" class="mp_buttons">
125 <button data-montage-id="mp_cancel_btn" class="mp_cancel_btn nj-skinned"></button> 147 <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> 148 <button data-montage-id="mp_ok_btn" class="mp_ok_btn nj-skinned"></button>
149 <button data-montage-id="mp_saveAs_btn" class="mp_saveAs_btn nj-skinned"></button>
127 </div> 150 </div>
128 </div> 151 </div>
129 </body> 152 </body>
130</html> 153</html>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 23:35:42 +0000