Ticket #5894: 5894_3.patch

_source/themes/default/theme.js

@@ -184 +184 @@
                                                                 '<div id="%title#" class="%title" role="presentation"></div>' +
                                                                 '<a id="%close_button#" class="%close_button" href="javascript:void(0)" title="' +  editor.lang.common.close+'" role="button"><span class="cke_label">X</span></a>' +
                                                                 '<div id="%tabs#" class="%tabs" role="tablist"></div>' +
-                                                                '<table class="%contents" role="presentation"><tr>' +
+                                                                '<table class="%contents" role="presentation">' +
+                                                                '<tr>' +
                                                                   '<td id="%contents#" class="%contents" role="presentation"></td>' +
-                                                                '</tr></table>' +
-                                                                '<div id="%footer#" class="%footer" role="presentation"></div>' +
+                                                                '</tr>' +
+                                                                '<tr>' +
+                                                                  '<td id="%footer#" class="%footer" role="presentation"></td>' +
+                                                                '</tr>' +
+                                                                '</table>' +
                                                         '</div>' +
                                                         '<div id="%tl#" class="%tl"></div>' +
                                                         '<div id="%tc#" class="%tc"></div>' +
@@ -226 +230 @@
                                         close           : close,
                                         tabs            : body.getChild( 2 ),
                                         contents        : body.getChild( [ 3, 0, 0, 0 ] ),
-                                        footer          : body.getChild( 4 )
+                                        footer          : body.getChild( [ 3, 0, 1, 0 ] )
                                 }
                         };
                 },

_source/skins/office2003/dialog.css

@@ -429 +429 @@
         cursor: default;
 }
 
+.cke_skin_office2003 a.cke_dialog_ui_button_ok span,
+.cke_skin_office2003 a.cke_dialog_ui_button_cancel span
+{
+        width:60px;
+}
+
 .cke_skin_office2003 span.cke_dialog_ui_button
 {
         background-image: url(images/sprites.png);
@@ -485 +491 @@
 
 .cke_skin_office2003 .cke_dialog_footer_buttons span.cke_dialog_ui_button
 {
-        width: 60px;
         margin: 7px 0;
 }
 

_source/skins/v2/dialog.css

@@ -428 +428 @@
         cursor: default;
 }
 
+.cke_skin_v2 a.cke_dialog_ui_button_ok span,
+.cke_skin_v2 a.cke_dialog_ui_button_cancel span
+{
+        width:60px;
+}
+
 .cke_skin_v2 span.cke_dialog_ui_button
 {
         border: #737357 1px solid;
@@ -481 +487 @@
 
 .cke_skin_v2 .cke_dialog_footer_buttons span.cke_dialog_ui_button
 {
-        width: 60px;
         margin: 7px 0;
 }
 

_source/skins/kama/dialog.css

@@ -394 +394 @@
 .cke_skin_kama a.cke_dialog_ui_button_ok span,
 .cke_skin_kama a.cke_dialog_ui_button_cancel span
 {
+        width:60px;
         padding-right: 20px;
         padding-left: 20px;
 }
@@ -517 +518 @@
 .cke_skin_kama .cke_dialog_footer_buttons span.cke_dialog_ui_button
 {
         margin: 7px 0;
-        width: 60px;
         text-align: center;
 }