Index: /CKEditor/branches/prototype/_source/themes/default/theme.js
===================================================================
--- /CKEditor/branches/prototype/_source/themes/default/theme.js	(revision 2953)
+++ /CKEditor/branches/prototype/_source/themes/default/theme.js	(revision 2954)
@@ -90,66 +90,56 @@
 		buildDialog : function( editor )
 		{
-			var name = editor.name,
-				element = editor.element,
-				dialogId = CKEDITOR.tools.getNextNumber(),
-				cover = null;
-
-			if ( !editor._.dialogCover )
-			{
-				cover = editor._.dialogCover = CKEDITOR.dom.element.createFromHtml( [
-							'<div id="cke_dialog_cover"></div>'
-						].join('') );
-			}
-
 			var container = CKEDITOR.dom.element.createFromHtml( [
 					'<div class="cke_skin_', editor.config.skin, ' ', browserCssClass, ' ',
 						CKEDITOR.document.$.compatMode == 'CSS1Compat' ? 'cke_mode_standards' : 'cke_mode_quirks',
 						' ', 'cke_', editor.lang.dir,
-						'" ', 'dir="', editor.lang.dir, '"><div id="cke_dialog_%d" class="cke_dialog" style="position:',
+						'" ', 'dir="', editor.lang.dir, '"><div id="%#" class="cke_dialog" style="position:',
 						( CKEDITOR.env.ie6Compat ? 'absolute;' : 'fixed;' ),
 						'">',
 						'<div>',
-							'<div id="cke_dialog_tl_%d" class="cke_dialog_tl">',
-								'<div id="cke_dialog_tl_resize_%d" class="cke_dialog_tl_resize"></div>',
+							'<div id="%tl_#" class="%tl">',
+								'<div id="%tl_resize_#" class="%tl_resize"></div>',
 							'</div>',
-							'<div id="cke_dialog_t_%d" class="cke_dialog_t">',
-								'<div id="cke_dialog_t_resize_%d" class="cke_dialog_t_resize"></div>',
+							'<div id="%t_#" class="%t">',
+								'<div id="%t_resize_#" class="%t_resize"></div>',
 							'</div>',
-							'<div id="cke_dialog_tr_%d" class="cke_dialog_tr">',
-								'<div id="cke_dialog_tr_resize_%d" class="cke_dialog_tr_resize"></div>',
+							'<div id="%tr_#" class="%tr">',
+								'<div id="%tr_resize_#" class="%tr_resize"></div>',
 							'</div>',
 						'</div>',
 						'<div>',
-							'<div id="cke_dialog_l_%d" class="cke_dialog_l">',
-								'<div id="cke_dialog_l_resize_%d" class="cke_dialog_l_resize"></div>',
+							'<div id="%l_#" class="%l">',
+								'<div id="%l_resize_#" class="%l_resize"></div>',
 							'</div>',
-							'<div id="cke_dialog_c_%d" class="cke_dialog_c">',
-								'<div id="cke_dialog_title_%d" class="cke_dialog_title">',
-									'<div id="cke_dialog_close_button_%d" class="cke_dialog_close_button"></div>',
+							'<div id="%c_#" class="%c">',
+								'<div id="%title_#" class="%title">',
+									'<div id="%close_button_#" class="%close_button"></div>',
 								'</div>',
-								'<table id="cke_dialog_tabs_%d" class="cke_dialog_tabs" cellpadding="0" border="0" cellspacing="0"><tbody><tr>',
+								'<table id="%tabs_#" class="%tabs" cellpadding="0" border="0" cellspacing="0"><tbody><tr>',
 								'<td class="head_filler">&nbsp;</td>',
 								'<td class="tail_filler">&nbsp;</td>',
 								'</tr></tbody></table>',
-								'<div id="cke_dialog_contents_%d" class="cke_dialog_contents"></div>',
-								'<div id="cke_dialog_footer_%d" class="cke_dialog_footer"></div>',
+								'<div id="%contents_#" class="%contents"></div>',
+								'<div id="%footer_#" class="%footer"></div>',
 							'</div>',
-							'<div id="cke_dialog_r_%d" class="cke_dialog_r">',
-								'<div id="cke_dialog_r_resize_%d" class="cke_dialog_r_resize"></div>',
+							'<div id="%r_#" class="%r">',
+								'<div id="%r_resize_#" class="%r_resize"></div>',
 							'</div>',
 						'</div>',
 						'<div>',
-							'<div id="cke_dialog_bl_%d" class="cke_dialog_bl">',
-								'<div id="cke_dialog_bl_resize_%d" class="cke_dialog_bl_resize"></div>',
+							'<div id="%bl_#" class="%bl">',
+								'<div id="%bl_resize_#" class="%bl_resize"></div>',
 							'</div>',
-							'<div id="cke_dialog_b_%d" class="cke_dialog_b">',
-								'<div id="cke_dialog_b_resize_%d" class="cke_dialog_b_resize"></div>',
+							'<div id="%b_#" class="%b">',
+								'<div id="%b_resize_#" class="%b_resize"></div>',
 							'</div>',
-							'<div id="cke_dialog_br_%d" class="cke_dialog_br">',
-								'<div id="cke_dialog_br_resize_%d" class="cke_dialog_br_resize"></div>',
+							'<div id="%br_#" class="%br">',
+								'<div id="%br_resize_#" class="%br_resize"></div>',
 							'</div>',
 						'</div>',
 					'</div></div>'
-				].join( '' ).replace( /%d/g, dialogId ) );
+				].join( '' )
+					.replace( /#/g, CKEDITOR.tools.getNextNumber() )
+					.replace( /%/g, 'cke_dialog_' ) );
 
 			container.getChild( [0, 1, 1, 0] ).unselectable();