8 files changed, 83 insertions, 55 deletions
diff --git a/node_modules/montage/ui/popup/alert.reel/alert.css b/node_modules/montage/ui/popup/alert.reel/alert.css
index 6dee8b6a..70df5033 100755
--- a/node_modules/montage/ui/popup/alert.reel/alert.css
+++ b/node_modules/montage/ui/popup/alert.reel/alert.css
@@ -3,21 +3,21 @@
 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
- 
 .montage-alert-dialog {
    min-width: 300px;
-} 
+}
 .montage-alert-dialog .montage-alert-content {
    font-size: 1.3em;
    padding: 15px;
-    
 }
 .montage-alert-dialog .montage-alert-actions {
    float: right;
 }
 /*
- 
 .montage-alert-dialog {
    font-family: "AG Buch BQ Regular", "AG Buch BQ", Helvetica, Arial, sans-serif;
    background-color: #333;
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 @@
        }
    },
    "button1": {
-        "module": "montage/ui/button.reel",
+        "module": "montage/ui/bluemoon/button.reel",
        "name": "Button",
        "properties": {
            "identifier": "Ok",
@@ -98,23 +98,23 @@
    </head>
    <body>
        <div id="alert-container" class="montage-alert-dialog">
-            
            <div class="montage-popup-header">
                <h3 id="title" class="title"></h3>
            </div>
-            
            <div class="montage-alert-content">
                    <div id="msg" class="msg"></div>
-                    <div id="msg-detail" class="msg-detail"></div>                
+                    <div id="msg-detail" class="msg-detail"></div>
            </div>
-            
            <div class="montage-popup-footer">
                <div class="montage-alert-actions">
-                    <div class="submit" id="action-ok">OK</div>
+                    <button class="submit" id="action-ok">OK</button>
                </div>
                <div class="clearfix"></div>
            </div>
-            
        </div>
    </body>
 </html>
diff --git a/node_modules/montage/ui/popup/confirm.reel/confirm.css b/node_modules/montage/ui/popup/confirm.reel/confirm.css
index 8d326cce..959cf719 100755
--- a/node_modules/montage/ui/popup/confirm.reel/confirm.css
+++ b/node_modules/montage/ui/popup/confirm.reel/confirm.css
@@ -3,7 +3,7 @@
 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
- 
 .montage-confirm-dialog {
     min-width: 300px;
 }
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 @@
        }
    },
    "button1": {
-        "module": "montage/ui/button.reel",
+        "module": "montage/ui/bluemoon/button.reel",
        "name": "Button",
        "properties": {
            "identifier": "Ok",
@@ -56,7 +56,7 @@
        ]
    },
    "button2": {
-        "module": "montage/ui/button.reel",
+        "module": "montage/ui/bluemoon/button.reel",
        "name": "Button",
        "properties": {
            "identifier": "Cancel",
@@ -98,20 +98,20 @@
    </head>
    <body>
        <div id="confirm-container" class="montage-confirm-dialog">
-            
            <div class="montage-popup-header">
                <h3 id="title" class="title">Confirmation</h3>
            </div>
-            
            <div class="montage-confirm-content">
                    <div id="msg" class="msg"></div>
-                    <div id="msg-detail" class="msg-detail"></div>                
+                    <div id="msg-detail" class="msg-detail"></div>
            </div>
-            
            <div class="montage-popup-footer">
                <div class="montage-confirm-actions">
-                    <div class="cancel" id="action-cancel"></div>
+                    <button class="cancel" id="action-cancel">Cancel</button>
-                    <div class="submit" id="action-ok"></div>
+                    <button class="submit" id="action-ok">OK</button>
                </div>
                <div class="clearfix"></div>
            </div>
diff --git a/node_modules/montage/ui/popup/confirm.reel/confirm.js b/node_modules/montage/ui/popup/confirm.reel/confirm.js
index 8e1660c5..7e186e29 100755
--- a/node_modules/montage/ui/popup/confirm.reel/confirm.js
+++ b/node_modules/montage/ui/popup/confirm.reel/confirm.js
@@ -34,7 +34,7 @@ var Confirm = exports.Confirm = Montage.create(Component, /** @lends module:"mon
    msg: {
        value: 'Are you sure?'
    },
-    
    /**
        Text to display on the OK button
        @type {Property}
@@ -43,7 +43,7 @@ var Confirm = exports.Confirm = Montage.create(Component, /** @lends module:"mon
    okLabel: {
        value: 'OK'
    },
-    
    /**
        Text to display on the Cancel button
        @type {Property}
@@ -52,7 +52,7 @@ var Confirm = exports.Confirm = Montage.create(Component, /** @lends module:"mon
    cancelLabel: {
        value: 'Cancel'
    },
-    
 /**
  Description TODO
  @private
@@ -164,9 +164,9 @@ var Confirm = exports.Confirm = Montage.create(Component, /** @lends module:"mon
                confirm = Confirm.create();
                popup.content = confirm;
            }
-            
            confirm = popup.content;
-            
            if (typeof(options) === "string") {
                confirm.msg = options;

diff --git a/node_modules/montage/ui/popup/alert.reel/alert.css b/node_modules/montage/ui/popup/alert.reel/alert.css index 6dee8b6a..70df5033 100755 --- a/node_modules/montage/ui/popup/alert.reel/alert.css +++ b/node_modules/montage/ui/popup/alert.reel/alert.css
@@ -3,21 +3,21 @@
3	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>	3	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.	4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5	</copyright> */	5	</copyright> */
6		6
7	.montage-alert-dialog {	7	.montage-alert-dialog {
8	min-width: 300px;	8	min-width: 300px;
9	}	9	}
10	.montage-alert-dialog .montage-alert-content {	10	.montage-alert-dialog .montage-alert-content {
11	font-size: 1.3em;	11	font-size: 1.3em;
12	padding: 15px;	12	padding: 15px;
13		13
14	}	14	}
15	.montage-alert-dialog .montage-alert-actions {	15	.montage-alert-dialog .montage-alert-actions {
16	float: right;	16	float: right;
17	}	17	}
18		18
19	/*	19	/*
20		20
21	.montage-alert-dialog {	21	.montage-alert-dialog {
22	font-family: "AG Buch BQ Regular", "AG Buch BQ", Helvetica, Arial, sans-serif;	22	font-family: "AG Buch BQ Regular", "AG Buch BQ", Helvetica, Arial, sans-serif;
23	background-color: #333;	23	background-color: #333;


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>


diff --git a/node_modules/montage/ui/popup/confirm.reel/confirm.css b/node_modules/montage/ui/popup/confirm.reel/confirm.css index 8d326cce..959cf719 100755 --- a/node_modules/montage/ui/popup/confirm.reel/confirm.css +++ b/node_modules/montage/ui/popup/confirm.reel/confirm.css
@@ -3,7 +3,7 @@
3	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>	3	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.	4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5	</copyright> */	5	</copyright> */
6		6
7	.montage-confirm-dialog {	7	.montage-confirm-dialog {
8	min-width: 300px;	8	min-width: 300px;
9	}	9	}


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>


diff --git a/node_modules/montage/ui/popup/confirm.reel/confirm.js b/node_modules/montage/ui/popup/confirm.reel/confirm.js index 8e1660c5..7e186e29 100755 --- a/node_modules/montage/ui/popup/confirm.reel/confirm.js +++ b/node_modules/montage/ui/popup/confirm.reel/confirm.js
@@ -34,7 +34,7 @@ var Confirm = exports.Confirm = Montage.create(Component, /** @lends module:"mon
34	msg: {	34	msg: {
35	value: 'Are you sure?'	35	value: 'Are you sure?'
36	},	36	},
37		37
38	/**	38	/**
39	Text to display on the OK button	39	Text to display on the OK button
40	@type {Property}	40	@type {Property}
@@ -43,7 +43,7 @@ var Confirm = exports.Confirm = Montage.create(Component, /** @lends module:"mon
43	okLabel: {	43	okLabel: {
44	value: 'OK'	44	value: 'OK'
45	},	45	},
46		46
47	/**	47	/**
48	Text to display on the Cancel button	48	Text to display on the Cancel button
49	@type {Property}	49	@type {Property}
@@ -52,7 +52,7 @@ var Confirm = exports.Confirm = Montage.create(Component, /** @lends module:"mon
52	cancelLabel: {	52	cancelLabel: {
53	value: 'Cancel'	53	value: 'Cancel'
54	},	54	},
55		55
56	/**	56	/**
57	Description TODO	57	Description TODO
58	@private	58	@private
@@ -164,9 +164,9 @@ var Confirm = exports.Confirm = Montage.create(Component, /** @lends module:"mon
164	confirm = Confirm.create();	164	confirm = Confirm.create();
165	popup.content = confirm;	165	popup.content = confirm;
166	}	166	}
167		167
168	confirm = popup.content;	168	confirm = popup.content;
169		169
170	if (typeof(options) === "string") {	170	if (typeof(options) === "string") {
171	confirm.msg = options;	171	confirm.msg = options;
172	confirm.okLabel = "OK";	<