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/save-as-dialog.reel/save-as-dialog.html | |
| 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/save-as-dialog.reel/save-as-dialog.html')
| -rw-r--r-- | js/io/ui/save-as-dialog.reel/save-as-dialog.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.html b/js/io/ui/save-as-dialog.reel/save-as-dialog.html index 999f2057..dcdb073f 100644 --- a/js/io/ui/save-as-dialog.reel/save-as-dialog.html +++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.html | |||
| @@ -39,22 +39,22 @@ | |||
| 39 | </script> | 39 | </script> |
| 40 | </head> | 40 | </head> |
| 41 | <body> | 41 | <body> |
| 42 | <div id="saveAsDialog" class="saveAsDialog"> | 42 | <div data-montage-id="saveAsDialog" class="saveAsDialog"> |
| 43 | <div class="title">Save As</div> | 43 | <div class="title">Save As</div> |
| 44 | <div class="locationSelection"> | 44 | <div class="locationSelection"> |
| 45 | <div class="filename"> | 45 | <div class="filename"> |
| 46 | <span class="nameText">Save As :</span> | 46 | <span class="nameText">Save As :</span> |
| 47 | <input id="newFileName" class="nj-skinned newFileName" type="search" value="" /> | 47 | <input data-montage-id="newFileName" class="nj-skinned newFileName" type="search" value="" /> |
| 48 | </div> | 48 | </div> |
| 49 | <div> | 49 | <div> |
| 50 | <span>Location :</span> | 50 | <span>Location :</span> |
| 51 | <div id="fileInputField"></div> | 51 | <div data-montage-id="fileInputField"></div> |
| 52 | </div> | 52 | </div> |
| 53 | </div> | 53 | </div> |
| 54 | <div class="errorMsg"><span id="error" class="error"></span></div> | 54 | <div class="errorMsg"><span data-montage-id="error" class="error"></span></div> |
| 55 | <div class="buttons"> | 55 | <div class="buttons"> |
| 56 | <button id="cancelButton" type="button" value="CANCEL" class="cancelButton nj-skinned" >CANCEL</button> | 56 | <button data-montage-id="cancelButton" type="button" value="CANCEL" class="cancelButton nj-skinned" >CANCEL</button> |
| 57 | <button id="okButton" disabled="true" type="button" value="OK" class="okButton nj-skinned" >OK</button> | 57 | <button data-montage-id="okButton" disabled="true" type="button" value="OK" class="okButton nj-skinned" >OK</button> |
| 58 | </div> | 58 | </div> |
| 59 | 59 | ||
| 60 | </div> | 60 | </div> |