diff options
| 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/io/ui/new-file-dialog/new-file-location.reel | |
| parent | 843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff) | |
| parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
| download | ninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz | |
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
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> |