diff options
author | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
commit | c6ae80c488621d4ac189cb63309b6258115f823a (patch) | |
tree | dfa26112e1830972fcb212bbb5b17c9a901c645f /node_modules/montage/ui/popup/confirm.reel/confirm.html | |
parent | 022e714cb5d10cd8575ab9907eddfb184a990b66 (diff) | |
parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
download | ninja-c6ae80c488621d4ac189cb63309b6258115f823a.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate
Diffstat (limited to 'node_modules/montage/ui/popup/confirm.reel/confirm.html')
-rwxr-xr-x | node_modules/montage/ui/popup/confirm.reel/confirm.html | 59 |
1 files changed, 27 insertions, 32 deletions
diff --git a/node_modules/montage/ui/popup/confirm.reel/confirm.html b/node_modules/montage/ui/popup/confirm.reel/confirm.html index 1c9b7caf..ab72e46a 100755 --- a/node_modules/montage/ui/popup/confirm.reel/confirm.html +++ b/node_modules/montage/ui/popup/confirm.reel/confirm.html | |||
@@ -5,11 +5,11 @@ | |||
5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
6 | </copyright> --> | 6 | </copyright> --> |
7 | <html> | 7 | <html> |
8 | <head> | 8 | <head> |
9 | <meta http-equiv="content-type" content="text/html; charset=utf-8"/> | 9 | <meta charset="utf-8"> |
10 | <link rel="stylesheet" type="text/css" href="confirm.css"> | 10 | <link rel="stylesheet" href="confirm.css"> |
11 | <script type="text/montage-serialization">{ | 11 | <script type="text/montage-serialization"> |
12 | 12 | { | |
13 | "dynamictext1": { | 13 | "dynamictext1": { |
14 | "prototype": "ui/dynamic-text.reel", | 14 | "prototype": "ui/dynamic-text.reel", |
15 | "properties": { | 15 | "properties": { |
@@ -22,7 +22,7 @@ | |||
22 | } | 22 | } |
23 | }, | 23 | }, |
24 | "button1": { | 24 | "button1": { |
25 | "prototype": "ui/bluemoon/button.reel", | 25 | "prototype": "ui/button.reel", |
26 | "properties": { | 26 | "properties": { |
27 | "identifier": "Ok", | 27 | "identifier": "Ok", |
28 | "element": { | 28 | "element": { |
@@ -42,7 +42,7 @@ | |||
42 | ] | 42 | ] |
43 | }, | 43 | }, |
44 | "button2": { | 44 | "button2": { |
45 | "prototype": "ui/bluemoon/button.reel", | 45 | "prototype": "ui/button.reel", |
46 | "properties": { | 46 | "properties": { |
47 | "identifier": "Cancel", | 47 | "identifier": "Cancel", |
48 | "element": { | 48 | "element": { |
@@ -69,30 +69,25 @@ | |||
69 | } | 69 | } |
70 | } | 70 | } |
71 | } | 71 | } |
72 | 72 | } | |
73 | }</script> | 73 | </script> |
74 | 74 | </head> | |
75 | 75 | <body> | |
76 | </head> | 76 | <div data-montage-id="confirm-container" class="montage-confirm-dialog"> |
77 | <body> | 77 | <div class="montage-popup-header"> |
78 | <div data-montage-id="confirm-container" class="montage-confirm-dialog"> | 78 | <h3 data-montage-id="title" class="title">Confirmation</h3> |
79 | 79 | </div> | |
80 | <div class="montage-popup-header"> | 80 | <div class="montage-confirm-content"> |
81 | <h3 data-montage-id="title" class="title">Confirmation</h3> | 81 | <div data-montage-id="msg" class="msg"></div> |
82 | </div> | 82 | <div data-montage-id="msg-detail" class="msg-detail"></div> |
83 | 83 | </div> | |
84 | <div class="montage-confirm-content"> | 84 | <div class="montage-popup-footer"> |
85 | <div data-montage-id="msg" class="msg"></div> | 85 | <div class="montage-confirm-actions"> |
86 | <div data-montage-id="msg-detail" class="msg-detail"></div> | 86 | <button class="cancel" data-montage-id="action-cancel">Cancel</button> |
87 | </div> | 87 | <button class="submit" data-montage-id="action-ok">OK</button> |
88 | |||
89 | <div class="montage-popup-footer"> | ||
90 | <div class="montage-confirm-actions"> | ||
91 | <button class="cancel" data-montage-id="action-cancel">Cancel</button> | ||
92 | <button class="submit" data-montage-id="action-ok">OK</button> | ||
93 | </div> | ||
94 | <div class="clearfix"></div> | ||
95 | </div> | 88 | </div> |
89 | <div class="clearfix"></div> | ||
96 | </div> | 90 | </div> |
97 | </body> | 91 | </div> |
98 | </html> | 92 | </body> |
93 | </html> \ No newline at end of file | ||