diff options
author | hwc487 | 2012-05-11 13:52:55 -0700 |
---|---|---|
committer | hwc487 | 2012-05-11 13:52:55 -0700 |
commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /js/panels/properties.reel/sections | |
parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
Diffstat (limited to 'js/panels/properties.reel/sections')
6 files changed, 35 insertions, 35 deletions
diff --git a/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html b/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html index 990dc739..cef44f31 100755 --- a/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html +++ b/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html | |||
@@ -38,11 +38,11 @@ | |||
38 | </script> | 38 | </script> |
39 | </head> | 39 | </head> |
40 | <body> | 40 | <body> |
41 | <div id="section"> | 41 | <div data-montage-id="section"> |
42 | <section class="fieldCol"> | 42 | <section class="fieldCol"> |
43 | <article class="fieldRow colorSelect"> | 43 | <article class="fieldRow colorSelect"> |
44 | <div id="Stroke"></div> | 44 | <div data-montage-id="Stroke"></div> |
45 | <div id="Fill"></div> | 45 | <div data-montage-id="Fill"></div> |
46 | </article> | 46 | </article> |
47 | </section> | 47 | </section> |
48 | </div> | 48 | </div> |
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 index d1b5f28b..bdcbff7f 100755 --- 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 | |||
@@ -44,17 +44,17 @@ | |||
44 | </script> | 44 | </script> |
45 | </head> | 45 | </head> |
46 | <body> | 46 | <body> |
47 | <div id="section"> | 47 | <div data-montage-id="section"> |
48 | <section class="fieldCol"> | 48 | <section class="fieldCol"> |
49 | <label class="lbl"></label> | 49 | <label class="lbl"></label> |
50 | <article class="fieldRow"> | 50 | <article class="fieldRow"> |
51 | <div id="slotElement" class="inputField"> | 51 | <div data-montage-id="slotElement" class="inputField"> |
52 | 52 | ||
53 | </div> | 53 | </div> |
54 | </article> | 54 | </article> |
55 | <label class="lbl"></label> | 55 | <label class="lbl"></label> |
56 | <article class="fieldRow"> | 56 | <article class="fieldRow"> |
57 | <div id="slotElement2" class="inputField"> | 57 | <div data-montage-id="slotElement2" class="inputField"> |
58 | 58 | ||
59 | </div> | 59 | </div> |
60 | </article> | 60 | </article> |
diff --git a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html index b606e5db..88f12186 100755 --- a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html +++ b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html | |||
@@ -31,11 +31,11 @@ | |||
31 | </script> | 31 | </script> |
32 | </head> | 32 | </head> |
33 | <body> | 33 | <body> |
34 | <div id="section"> | 34 | <div data-montage-id="section"> |
35 | <section class="fieldCol"> | 35 | <section class="fieldCol"> |
36 | <label><span class="lbl"></span></label> | 36 | <label><span class="lbl"></span></label> |
37 | <article class="fieldRow"> | 37 | <article class="fieldRow"> |
38 | <div id="slotElement" class="inputField"> | 38 | <div data-montage-id="slotElement" class="inputField"> |
39 | 39 | ||
40 | </div> | 40 | </div> |
41 | </article> | 41 | </article> |
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.html b/js/panels/properties.reel/sections/custom.reel/custom.html index cc48d2e7..cfc5208c 100755 --- a/js/panels/properties.reel/sections/custom.reel/custom.html +++ b/js/panels/properties.reel/sections/custom.reel/custom.html | |||
@@ -49,9 +49,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
49 | </script> | 49 | </script> |
50 | </head> | 50 | </head> |
51 | <body> | 51 | <body> |
52 | <div id="section" class="sectional"> | 52 | <div data-montage-id="section" class="sectional"> |
53 | <div id="repetitionContainer"> | 53 | <div data-montage-id="repetitionContainer"> |
54 | <div id="repeitionContent"></div> | 54 | <div data-montage-id="repeitionContent"></div> |
55 | </div> | 55 | </div> |
56 | </div> | 56 | </div> |
57 | </body> | 57 | </body> |
diff --git a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html b/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html index 59bbe346..a7aac84e 100755 --- a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html +++ b/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html | |||
@@ -92,33 +92,33 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
92 | </script> | 92 | </script> |
93 | </head> | 93 | </head> |
94 | <body> | 94 | <body> |
95 | <div id="section" class="sectional"> | 95 | <div data-montage-id="section" class="sectional"> |
96 | <section id="position" class="fieldCol"> | 96 | <section data-montage-id="position" class="fieldCol"> |
97 | <label id="labelX">Left:</label> | 97 | <label data-montage-id="labelX">Left:</label> |
98 | <article class="fieldRow twoCol"> | 98 | <article class="fieldRow twoCol"> |
99 | <div> | 99 | <div> |
100 | <div class="inputField"> | 100 | <div class="inputField"> |
101 | <div id="PosX"></div> | 101 | <div data-montage-id="PosX"></div> |
102 | </div> | 102 | </div> |
103 | </div> | 103 | </div> |
104 | <div> | 104 | <div> |
105 | <div> | 105 | <div> |
106 | <label id="labelY">Top:</label> | 106 | <label data-montage-id="labelY">Top:</label> |
107 | </div> | 107 | </div> |
108 | <div class="inputField"> | 108 | <div class="inputField"> |
109 | <div id="PosY"></div> | 109 | <div data-montage-id="PosY"></div> |
110 | </div> | 110 | </div> |
111 | </div> | 111 | </div> |
112 | </article> | 112 | </article> |
113 | </section> | 113 | </section> |
114 | <hr /> | 114 | <hr /> |
115 | <section class="fieldCol"> | 115 | <section class="fieldCol"> |
116 | <button id="posBound" class="unlock"></button> | 116 | <button data-montage-id="posBound" id="posBound" class="unlock"></button> |
117 | <label>Width:</label> | 117 | <label>Width:</label> |
118 | <article class="fieldRow twoCol"> | 118 | <article class="fieldRow twoCol"> |
119 | <div> | 119 | <div> |
120 | <div class="inputField"> | 120 | <div class="inputField"> |
121 | <div id="PosW"></div> | 121 | <div data-montage-id="PosW"></div> |
122 | </div> | 122 | </div> |
123 | </div> | 123 | </div> |
124 | <div> | 124 | <div> |
@@ -126,7 +126,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
126 | <label>Height:</label> | 126 | <label>Height:</label> |
127 | </div> | 127 | </div> |
128 | <div class="inputField"> | 128 | <div class="inputField"> |
129 | <div id="PosH"></div> | 129 | <div data-montage-id="PosH"></div> |
130 | </div> | 130 | </div> |
131 | </div> | 131 | </div> |
132 | </article> | 132 | </article> |
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html index b82124d0..5ef13fab 100755 --- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html +++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html | |||
@@ -259,43 +259,43 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
259 | </script> | 259 | </script> |
260 | </head> | 260 | </head> |
261 | <body> | 261 | <body> |
262 | <section id="section" class="sectional"> | 262 | <section data-montage-id="section" class="sectional"> |
263 | <section id="axisMode" class="fieldCol rotation"> | 263 | <section data-montage-id="axisMode" class="fieldCol rotation"> |
264 | <label>Axis:</label> | 264 | <label>Axis:</label> |
265 | <article class="fieldRow"> | 265 | <article class="fieldRow"> |
266 | <div class="inputField"> | 266 | <div class="inputField"> |
267 | <div id="rdioLocal"></div> | 267 | <div data-montage-id="rdioLocal"></div> |
268 | </div> | 268 | </div> |
269 | </article> | 269 | </article> |
270 | <article class="fieldRow"> | 270 | <article class="fieldRow"> |
271 | <div class="inputField"> | 271 | <div class="inputField"> |
272 | <div id="rdioGlobal"></div> | 272 | <div data-montage-id="rdioGlobal"></div> |