Ticket #7323: 7323.patch

_source/plugins/dialog/plugin.js

@@ -2227 +2227 @@
 
                                 // Write the inline CSS styles.
                                 var styleStr = ( elementDefinition.style || '' ).split( ';' );
+
+                                // Element alignment support.
+                                if ( elementDefinition.align )
+                                {
+                                        var align = elementDefinition.align;
+                                        styles[ 'margin-left' ] = align == 'left' ? 0 : 'auto';
+                                        styles[ 'margin-right' ] = align == 'right' ? 0 : 'auto';
+                                }
+
                                 for ( i in styles )
                                         styleStr.push( i + ':' + styles[i] );
                                 if ( elementDefinition.hidden )
@@ -2357 +2366 @@
                                                         styles.push( 'height:' + cssLength( height ) );
                                                 if ( elementDefinition && elementDefinition.padding != undefined )
                                                         styles.push( 'padding:' + cssLength( elementDefinition.padding ) );
+                                                // In IE Quirks alignment has to be done on table cells. (#7324)
+                                                if ( CKEDITOR.env.ie && CKEDITOR.env.quirks && children[ i ].align )
+                                                        styles.push( 'text-align:' + children[ i ].align );
                                                 if ( styles.length > 0 )
                                                         html.push( 'style="' + styles.join('; ') + '" ' );
                                                 html.push( '>', childHtmlList[i], '</td>' );
@@ -2442 +2454 @@
                                                         styles.push( 'height:' + Math.floor( 100 / childHtmlList.length ) + '%' );
                                                 if ( elementDefinition && elementDefinition.padding != undefined )
                                                         styles.push( 'padding:' + cssLength( elementDefinition.padding ) );
+                                                // In IE Quirks alignment has to be done on table cells. (#7324)
+                                                if ( CKEDITOR.env.ie && CKEDITOR.env.quirks && children[ i ].align )
+                                                        styles.push( 'text-align:' + children[ i ].align );
                                                 if ( styles.length > 0 )
                                                         html.push( 'style="', styles.join( '; ' ), '" ' );
                                                 html.push( ' class="cke_dialog_ui_vbox_child">', childHtmlList[i], '</td></tr>' );

_source/plugins/liststyle/dialogs/liststyle.js

@@ -46 +46 @@
                                                                 type : 'select',
                                                                 label : lang.type,
                                                                 id : 'type',
-                                                                style : 'width: 150px; margin: auto;',
+                                                                align : 'center',
+                                                                style : 'width:150px',
                                                                 items :
                                                                 [
                                                                         [ lang.notset, '' ],