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-options-navigator.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-options-navigator.reel')
| -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> |