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-options-navigator.reel/new-file-options-navigator.html | |
| 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-options-navigator.reel/new-file-options-navigator.html')
| -rwxr-xr-x | js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html index 58303a57..e0df60ae 100755 --- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html +++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html | |||
| @@ -35,25 +35,25 @@ | |||
| 35 | </script> | 35 | </script> |
| 36 | </head> | 36 | </head> |
| 37 | <body> | 37 | <body> |
| 38 | <div id="newfile" class="newfile"> | 38 | <div data-montage-id="newfile" class="newfile"> |
| 39 | <div class="title">Create New File</div> | 39 | <div class="title">Create New File</div> |
| 40 | <div class="container left-nav"> | 40 | <div class="container left-nav"> |
| 41 | <div class="projectTypeHeader"><span>Choose Type</span></div> | 41 | <div class="projectTypeHeader"><span>Choose Type</span></div> |
| 42 | <div id="projectTypeTree" class="projectTypeTree"></div> | 42 | <div data-montage-id="projectTypeTree" class="projectTypeTree"></div> |
| 43 | </div> | 43 | </div> |
| 44 | <div class="container right-nav"> | 44 | <div class="container right-nav"> |
| 45 | <div id="right-top" class="right-top"> | 45 | <div data-montage-id="right-top" class="right-top"> |
| 46 | <div id="templateIcons" class="templateIcons" style="display:block;"></div> | 46 | <div data-montage-id="templateIcons" class="templateIcons" style="display:block;"></div> |
| 47 | </div> | 47 | </div> |
| 48 | <div id="right-bottom" class="right-bottom"> | 48 | <div data-montage-id="right-bottom" class="right-bottom"> |
| 49 | <div class="templateIcon">templateIcon</div> | 49 | <div class="templateIcon">templateIcon</div> |
| 50 | <div class="selections">selections</div> | 50 | <div class="selections">selections</div> |
| 51 | </div> | 51 | </div> |
| 52 | </div> | 52 | </div> |
| 53 | <div class="errorMsg"><span id="error" class="error"></span></div> | 53 | <div class="errorMsg"><span id="error" class="error"></span></div> |
| 54 | <div class="buttons"> | 54 | <div class="buttons"> |
| 55 | <button id="cancelButton" value="CANCEL" class="nj-skinned cancelButton">Cancel</button> | 55 | <button data-montage-id="cancelButton" value="CANCEL" class="nj-skinned cancelButton">Cancel</button> |
| 56 | <button id="okButton" value="OK" disabled="true" class="nj-skinned okButton">Ok</button> | 56 | <button data-montage-id="okButton" value="OK" disabled="true" class="nj-skinned okButton">Ok</button> |
| 57 | </div> | 57 | </div> |
| 58 | </div> | 58 | </div> |
| 59 | </body> | 59 | </body> |