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/io/ui/new-file-dialog/new-file-location.reel | |
| 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/io/ui/new-file-dialog/new-file-location.reel')
| -rwxr-xr-x | js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html index 236b4f4e..f9a42887 100755 --- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html +++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html | |||
| @@ -74,23 +74,23 @@ | |||
| 74 | </script> | 74 | </script> |
| 75 | </head> | 75 | </head> |
| 76 | <body> | 76 | <body> |
| 77 | <div id="newfileLocation" class="newfileLocation"> | 77 | <div data-montage-id="newfileLocation" class="newfileLocation"> |
| 78 | <div class="templateSelection"> | 78 | <div class="templateSelection"> |
| 79 | <div class="template"></div> | 79 | <div class="template"></div> |
| 80 | </div> | 80 | </div> |
| 81 | <div class="locationSelection"> | 81 | <div class="locationSelection"> |
| 82 | <div> | 82 | <div> |
| 83 | <span class="nameText">NAME:</span> | 83 | <span class="nameText">NAME:</span> |
| 84 | <input id="newFileName" class="nj-skinned newFileName" type="search" value="" /> | 84 | <input data-montage-id="newFileName" class="nj-skinned newFileName" type="search" value="" /> |
| 85 | <span class="fileExtension"></span> | 85 | <span class="fileExtension"></span> |
| 86 | </div> | 86 | </div> |
| 87 | <div> | 87 | <div> |
| 88 | <span>DIRECTORY:</span> | 88 | <span>DIRECTORY:</span> |
| 89 | <div id="fileInputField"></div> | 89 | <div data-montage-id="fileInputField"></div> |
| 90 | </div> | 90 | </div> |
| 91 | <br /> | 91 | <br /> |
| 92 | <div style="display:none;"><span>WIDTH:</span><span class="templatePx" id="templateWidth"></span></div> | 92 | <div style="display:none;"><span>WIDTH:</span><span class="templatePx" data-montage-id="templateWidth"></span></div> |
| 93 | <div style="display:none;"><span>HEIGHT:</span><span class="templatePx" id="templateHeight"></span></div> | 93 | <div style="display:none;"><span>HEIGHT:</span><span class="templatePx" data-montage-id="templateHeight"></span></div> |
| 94 | </div> | 94 | </div> |
| 95 | </div> | 95 | </div> |
| 96 | </body> | 96 | </body> |