diff options
author | Eric Guzman | 2012-05-10 14:51:31 -0700 |
---|---|---|
committer | Eric Guzman | 2012-05-10 14:51:31 -0700 |
commit | 39f23ad4868482f395d2e210490a2d73545a9d84 (patch) | |
tree | c702d67585f72cddf55932411e7100133bc58452 /js/io/ui/save-as-dialog.reel | |
parent | 733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff) | |
parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
download | ninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
Diffstat (limited to 'js/io/ui/save-as-dialog.reel')
-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> |