diff options
| author | Valerio Virgillito | 2012-02-03 12:20:10 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-03 12:20:10 -0800 |
| commit | e6e539f345f5e1ac36a595db5d1a1c3700715e88 (patch) | |
| tree | 39846bf1570f9b5a4057b726c54905de9e9e1c02 /node_modules/montage/ui/popup/confirm.reel/confirm.html | |
| parent | 7950424cf704bb221971f4645406b01e6979db18 (diff) | |
| parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
| download | ninja-e6e539f345f5e1ac36a595db5d1a1c3700715e88.tar.gz | |
Merge branch 'master' into components
Conflicts:
node_modules/montage/ui/bluemoon/progress.reel/progress.html
node_modules/montage/ui/image2.reel/image2.html
node_modules/ninja-components/effect/desaturate-effect.js
node_modules/ninja-components/effect/effect.js
node_modules/ninja-components/effect/invert-effect.js
node_modules/ninja-components/effect/kaliedoscope-effect.js
node_modules/ninja-components/effect/multiply-effect.js
node_modules/ninja-components/effect/sepia-effect.js
node_modules/ninja-components/flow-controller.reel/flow-controller.html
node_modules/ninja-components/flow-controller.reel/flow-controller.js
node_modules/ninja-components/flow-offset.js
node_modules/ninja-components/hottext.reel/hottext.css
node_modules/ninja-components/hottext.reel/hottext.html
node_modules/ninja-components/hottext.reel/hottext.js
node_modules/ninja-components/hottextunit.reel/hottextunit.css
node_modules/ninja-components/hottextunit.reel/hottextunit.html
node_modules/ninja-components/hottextunit.reel/hottextunit.js
node_modules/ninja-components/image2.reel/image2.html
node_modules/ninja-components/image2.reel/image2.js
node_modules/ninja-components/image3d.reel/image3d.html
node_modules/ninja-components/image3d.reel/image3d.js
node_modules/ninja-components/photo-editor.reel/photo-editor.css
node_modules/ninja-components/photo-editor.reel/photo-editor.html
node_modules/ninja-components/photo-editor.reel/photo-editor.js
node_modules/ninja-components/slider-base.js
user-document-templates/montage-application-cloud/appdelegate.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/popup/confirm.reel/confirm.html')
| -rwxr-xr-x | node_modules/montage/ui/popup/confirm.reel/confirm.html | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/node_modules/montage/ui/popup/confirm.reel/confirm.html b/node_modules/montage/ui/popup/confirm.reel/confirm.html index 209fdc86..63b521bd 100755 --- a/node_modules/montage/ui/popup/confirm.reel/confirm.html +++ b/node_modules/montage/ui/popup/confirm.reel/confirm.html | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | } | 29 | } |
| 30 | }, | 30 | }, |
| 31 | "button1": { | 31 | "button1": { |
| 32 | "module": "montage/ui/button.reel", | 32 | "module": "montage/ui/bluemoon/button.reel", |
| 33 | "name": "Button", | 33 | "name": "Button", |
| 34 | "properties": { | 34 | "properties": { |
| 35 | "identifier": "Ok", | 35 | "identifier": "Ok", |
| @@ -56,7 +56,7 @@ | |||
| 56 | ] | 56 | ] |
| 57 | }, | 57 | }, |
| 58 | "button2": { | 58 | "button2": { |
| 59 | "module": "montage/ui/button.reel", | 59 | "module": "montage/ui/bluemoon/button.reel", |
| 60 | "name": "Button", | 60 | "name": "Button", |
| 61 | "properties": { | 61 | "properties": { |
| 62 | "identifier": "Cancel", | 62 | "identifier": "Cancel", |
| @@ -98,20 +98,20 @@ | |||
| 98 | </head> | 98 | </head> |
| 99 | <body> | 99 | <body> |
| 100 | <div id="confirm-container" class="montage-confirm-dialog"> | 100 | <div id="confirm-container" class="montage-confirm-dialog"> |
| 101 | 101 | ||
| 102 | <div class="montage-popup-header"> | 102 | <div class="montage-popup-header"> |
| 103 | <h3 id="title" class="title">Confirmation</h3> | 103 | <h3 id="title" class="title">Confirmation</h3> |
| 104 | </div> | 104 | </div> |
| 105 | 105 | ||
| 106 | <div class="montage-confirm-content"> | 106 | <div class="montage-confirm-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-confirm-actions"> | 112 | <div class="montage-confirm-actions"> |
| 113 | <div class="cancel" id="action-cancel"></div> | 113 | <button class="cancel" id="action-cancel">Cancel</button> |
| 114 | <div class="submit" id="action-ok"></div> | 114 | <button class="submit" id="action-ok">OK</button> |
| 115 | </div> | 115 | </div> |
| 116 | <div class="clearfix"></div> | 116 | <div class="clearfix"></div> |
| 117 | </div> | 117 | </div> |