diff options
| author | Ananya Sen | 2012-02-03 09:57:41 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-03 09:57:41 -0800 |
| commit | c093dd13a84ce6eb3e00a672c38a808093c5d966 (patch) | |
| tree | 5dfd4a800bbbe02a8cbcb3ffeee542686bc258bb /node_modules/montage/ui/popup/alert.reel/alert.html | |
| parent | 79b0173eeca079dec42ff1480182656dbe3af44f (diff) | |
| parent | 8e06b63e5eab5558823f4923e20a832c8b36cbe2 (diff) | |
| download | ninja-c093dd13a84ce6eb3e00a672c38a808093c5d966.tar.gz | |
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Conflicts:
js/io/document/document-controller.js
js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
js/io/ui/save-as-dialog.reel/save-as-dialog.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/popup/alert.reel/alert.html')
| -rwxr-xr-x | node_modules/montage/ui/popup/alert.reel/alert.html | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/node_modules/montage/ui/popup/alert.reel/alert.html b/node_modules/montage/ui/popup/alert.reel/alert.html index f71da981..cb4ef751 100755 --- a/node_modules/montage/ui/popup/alert.reel/alert.html +++ b/node_modules/montage/ui/popup/alert.reel/alert.html | |||
| @@ -65,7 +65,7 @@ | |||
| 65 | } | 65 | } |
| 66 | }, | 66 | }, |
| 67 | "button1": { | 67 | "button1": { |
| 68 | "module": "montage/ui/button.reel", | 68 | "module": "montage/ui/bluemoon/button.reel", |
| 69 | "name": "Button", | 69 | "name": "Button", |
| 70 | "properties": { | 70 | "properties": { |
| 71 | "identifier": "Ok", | 71 | "identifier": "Ok", |
| @@ -98,23 +98,23 @@ | |||
| 98 | </head> | 98 | </head> |
| 99 | <body> | 99 | <body> |
| 100 | <div id="alert-container" class="montage-alert-dialog"> | 100 | <div id="alert-container" class="montage-alert-dialog"> |
| 101 | 101 | ||
| 102 | <div class="montage-popup-header"> | 102 | <div class="montage-popup-header"> |
| 103 | <h3 id="title" class="title"></h3> | 103 | <h3 id="title" class="title"></h3> |
| 104 | </div> | 104 | </div> |
| 105 | 105 | ||
| 106 | <div class="montage-alert-content"> | 106 | <div class="montage-alert-content"> |
| 107 | <div id="msg" class="msg"></div> | 107 | <div id="msg" class="msg"></div> |
| 108 | <div id="msg-detail" class="msg-detail"></div> | 108 | <div id="msg-detail" class="msg-detail"></div> |
| 109 | </div> | 109 | </div> |
| 110 | 110 | ||
| 111 | <div class="montage-popup-footer"> | 111 | <div class="montage-popup-footer"> |
| 112 | <div class="montage-alert-actions"> | 112 | <div class="montage-alert-actions"> |
| 113 | <div class="submit" id="action-ok">OK</div> | 113 | <button class="submit" id="action-ok">OK</button> |
| 114 | </div> | 114 | </div> |
| 115 | <div class="clearfix"></div> | 115 | <div class="clearfix"></div> |
| 116 | </div> | 116 | </div> |
| 117 | 117 | ||
| 118 | </div> | 118 | </div> |
| 119 | </body> | 119 | </body> |
| 120 | </html> | 120 | </html> |