Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch

Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
author: John Mayhew 2012-05-07 16:30:19 -0700
committer: John Mayhew 2012-05-07 16:30:19 -0700
commit: db4ba95f50148198759dde503ec1c778184d9dbe (patch)
tree: 8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
parent: 843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff)
parent: 526e423e4a2734c2b139af23911e912452a4443f (diff)
download: ninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz
1 files changed, 15 insertions, 15 deletions
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
    </script>
 </head>
 <body>
-<section id="section" class="sectional">
+<section data-montage-id="section" class="sectional">
-    <section id="axisMode" class="fieldCol rotation">
+    <section data-montage-id="axisMode" class="fieldCol rotation">
        <label>Axis:</label>
        <article class="fieldRow">
            <div class="inputField">
-                <div id="rdioLocal"></div>
+                <div data-montage-id="rdioLocal"></div>
            </div>
        </article>
        <article class="fieldRow">
            <div class="inputField">
-                <div id="rdioGlobal"></div>
+                <div data-montage-id="rdioGlobal"></div>
            </div>
        </article>
    </section>
    <hr />
    <section class="fieldCol">
-        <label id="lblthreeDX">X:</label>
+        <label data-montage-id="lblthreeDX">X:</label>
        <article class="fieldRow threeCol">
            <div>
                <div class="inputField">
-                    <div id="threeDPosX"></div>
+                    <div data-montage-id="threeDPosX"></div>
                </div>
            </div>
            <div>
                <div>
-                    <label id="lblthreeDY">Y: </label>
+                    <label data-montage-id="lblthreeDY">Y: </label>
                </div>
                <div class="inputField">
-                    <div id="threeDPosY"></div>
+                    <div data-montage-id="threeDPosY"></div>
                </div>
            </div>
            <div>
                <div>
-                    <label id="lblthreeDZ">Z: </label>
+                    <label data-montage-id="lblthreeDZ">Z: </label>
                </div>
                <div class="inputField">
-                    <div id="threeDPosZ"></div>
+                    <div data-montage-id="threeDPosZ"></div>
                </div>
            </div>
        </article>
@@ -306,7 +306,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
        <article class="fieldRow threeCol">
            <div>
                <div class="inputField">
-                    <div id="threeDRotX"></div>
+                    <div data-montage-id="threeDRotX"></div>
                </div>
            </div>
            <div>
@@ -314,7 +314,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                    <label>Y: </label>
                </div>
                <div class="inputField">
-                    <div id="threeDRotY"></div>
+                    <div data-montage-id="threeDRotY"></div>
                </div>
            </div>
            <div>
@@ -322,7 +322,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                    <label>Z: </label>
                </div>
                <div class="inputField">
-                    <div id="threeDRotZ"></div>
+                    <div data-montage-id="threeDRotZ"></div>
                </div>
            </div>
        </article>
@@ -336,7 +336,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                    <label style="padding-right:14px;">Perspective Distance: </label>
                </div>
                <div class="inputField" >
-                    <div id="threeDPerspectiveDistance"></div>
+                    <div data-montage-id="threeDPerspectiveDistance"></div>
                </div>
            </div>
        </article>
@@ -347,7 +347,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
        <article class="fieldRow oneCol checkbox">
            <div>
                <div class="inputField">
-                    <input id="flattenCh" class="nj-skinned" type="checkbox" />
+                    <input data-montage-id="flattenCh" class="nj-skinned" type="checkbox" />
                </div>
                <div>
                    <label> Flatten</label>
author	John Mayhew	2012-05-07 16:30:19 -0700
committer	John Mayhew	2012-05-07 16:30:19 -0700
commit	db4ba95f50148198759dde503ec1c778184d9dbe (patch)
tree	8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html
parent	843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff)
parent	526e423e4a2734c2b139af23911e912452a4443f (diff)
download	ninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz

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>
273	</div>	273	</div>
274	</article>	274	</article>
275	</section>	275	</section>
276	<hr />	276	<hr />
277	<section class="fieldCol">	277	<section class="fieldCol">
278	<label id="lblthreeDX">X:</label>	278	<label data-montage-id="lblthreeDX">X:</label>
279	<article class="fieldRow threeCol">	279	<article class="fieldRow threeCol">
280	<div>	280	<div>
281	<div class="inputField">	281	<div class="inputField">
282	<div id="threeDPosX"></div>	282	<div data-montage-id="threeDPosX"></div>
283	</div>	283	</div>
284	</div>	284	</div>
285	<div>	285	<div>
286	<div>	286	<div>
287	<label id="lblthreeDY">Y: </label>	287	<label data-montage-id="lblthreeDY">Y: </label>
288	</div>	288	</div>
289	<div class="inputField">	289	<div class="inputField">
290	<div id="threeDPosY"></div>	290	<div data-montage-id="threeDPosY"></div>
291	</div>	291	</div>
292	</div>	292	</div>
293	<div>	293	<div>
294	<div>	294	<div>
295	<label id="lblthreeDZ">Z: </label>	295	<label data-montage-id="lblthreeDZ">Z: </label>
296	</div>	296	</div>
297	<div class="inputField">	297	<div class="inputField">
298	<div id="threeDPosZ"></div>	298	<div data-montage-id="threeDPosZ"></div>
299	</div>	299	</div>
300	</div>	300	</div>
301	</article>	301	</article>
@@ -306,7 +306,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
306	<article class="fieldRow threeCol">	306	<article class="fieldRow threeCol">
307	<div>	307	<div>
308	<div class="inputField">	308	<div class="inputField">
309	<div id="threeDRotX"></div>	309	<div data-montage-id="threeDRotX"></div>
310	</div>	310	</div>
311	</div>	311	</div>
312	<div>	312	<div>
@@ -314,7 +314,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
314	<label>Y: </label>	314	<label>Y: </label>
315	</div>	315	</div>
316	<div class="inputField">	316	<div class="inputField">
317	<div id="threeDRotY"></div>	317	<div data-montage-id="threeDRotY"></div>
318	</div>	318	</div>
319	</div>	319	</div>
320	<div>	320	<div>
@@ -322,7 +322,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
322	<label>Z: </label>	322	<label>Z: </label>
323	</div>	323	</div>
324	<div class="inputField">	324	<div class="inputField">
325	<div id="threeDRotZ"></div>	325	<div data-montage-id="threeDRotZ"></div>
326	</div>	326	</div>
327	</div>	327	</div>
328	</article>	328	</article>
@@ -336,7 +336,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
336	<label style="padding-right:14px;">Perspective Distance: </label>	336	<label style="padding-right:14px;">Perspective Distance: </label>
337	</div>	337	</div>
338	<div class="inputField" >	338	<div class="inputField" >
339	<div id="threeDPerspectiveDistance"></div>	339	<div data-montage-id="threeDPerspectiveDistance"></div>
340	</div>	340	</div>
341	</div>	341	</div>
342	</article>	342	</article>
@@ -347,7 +347,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
347	<article class="fieldRow oneCol checkbox">	347	<article class="fieldRow oneCol checkbox">
348	<div>	348	<div>
349	<div class="inputField">	349	<div class="inputField">
350	<input id="flattenCh" class="nj-skinned" type="checkbox" />	350	<input data-montage-id="flattenCh" class="nj-skinned" type="checkbox" />
351	</div>	351	</div>
352	<div>	352	<div>
353	<label> Flatten</label>	353	<label> Flatten</label>