From 713761c876f650a495f04995d87281b5aeec998f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Scott=20Gonz=C3=A1lez?= <scott.gonzalez@gmail.com>
Date: Thu, 11 Dec 2008 02:45:42 +0000
Subject: [PATCH] Dialog: Partial fix for #3648: Use new CSS framework.

---
 tests/dialog.js |  2 +-
 ui/ui.dialog.js | 37 ++++++++++++++++++++++++++++++++-----
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/tests/dialog.js b/tests/dialog.js
index ddc32e1b8..95e123a92 100644
--- a/tests/dialog.js
+++ b/tests/dialog.js
@@ -300,7 +300,7 @@ test("buttons", function() {
 		i++;
 	});
 
-	equals(btn.parent().attr('className'), 'ui-dialog-buttonpane', "buttons in container");
+	ok(btn.parent().hasClass('ui-dialog-buttonpane'), "buttons in container");
 	btn.trigger("click");
 
 	var newButtons = {
diff --git a/ui/ui.dialog.js b/ui/ui.dialog.js
index 2e6b8af3c..6c86249d6 100644
--- a/ui/ui.dialog.js
+++ b/ui/ui.dialog.js
@@ -38,7 +38,9 @@ $.widget("ui.dialog", {
 
 			uiDialogContent = this.element
 				.removeAttr('title')
-				.addClass('ui-dialog-content')
+				.addClass(
+					'ui-dialog-content ' +
+					'ui-widget-content')
 				.wrap('<div/>')
 				.wrap('<div/>'),
 
@@ -51,18 +53,30 @@ $.widget("ui.dialog", {
 				}),
 
 			uiDialogTitlebar = (this.uiDialogTitlebar = $('<div/>'))
-				.addClass('ui-dialog-titlebar')
+				.addClass(
+					'ui-dialog-titlebar ' +
+					'ui-widget-header ' +
+					'ui-corner-all ' +
+					'ui-helper-clearfix'
+				)
 				.mousedown(function() {
 					self.moveToTop();
 				})
 				.prependTo(uiDialogContainer),
 
 			uiDialogTitlebarClose = $('<a href="#"/>')
-				.addClass('ui-dialog-titlebar-close')
+				.addClass(
+					'ui-dialog-titlebar-close ' +
+					'ui-corner-all'
+				)
 				.attr('role', 'button')
 				.appendTo(uiDialogTitlebar),
 
 			uiDialogTitlebarCloseText = (this.uiDialogTitlebarCloseText = $('<span/>'))
+				.addClass(
+					'ui-icon ' +
+					'ui-icon-closethick'
+				)
 				.text(options.closeText)
 				.appendTo(uiDialogTitlebarClose),
 
@@ -77,7 +91,12 @@ $.widget("ui.dialog", {
 			uiDialog = (this.uiDialog = uiDialogContainer.parent())
 				.appendTo(document.body)
 				.hide()
-				.addClass('ui-dialog')
+				.addClass(
+					'ui-dialog ' +
+					'ui-widget ' +
+					'ui-widget-content ' +
+					'ui-corner-all'
+				)
 				.addClass(options.dialogClass)
 				.css({
 					position: 'absolute',
@@ -101,7 +120,11 @@ $.widget("ui.dialog", {
 				}),
 
 			uiDialogButtonPane = (this.uiDialogButtonPane = $('<div/>'))
-				.addClass('ui-dialog-buttonpane')
+				.addClass(
+					'ui-dialog-buttonpane ' +
+					'ui-widget-content ' +
+					'ui-helper-clearfix'
+				)
 				.css({
 					position: 'absolute',
 					bottom: 0
@@ -242,6 +265,10 @@ $.widget("ui.dialog", {
 			uiDialogButtonPane.show();
 			$.each(buttons, function(name, fn) {
 				$('<button type="button"></button>')
+					.addClass(
+						'ui-state-default ' +
+						'ui-corner-all'
+					)
 					.text(name)
 					.click(function() { fn.apply(self.element[0], arguments); })
 					.appendTo(uiDialogButtonPane);
-- 
2.39.5