Ticket #5587: 5587_5.patch
File 5587_5.patch, 9.9 KB (added by , 13 years ago) |
---|
-
_source/skins/kama/skin.js
20 20 editor : { css : [ 'editor.css' ] }, 21 21 dialog : { css : [ 'dialog.css' ] }, 22 22 templates : { css : [ 'templates.css' ] }, 23 cellProperties : { css : [ 'cellProperties.css' ] }, 23 24 margins : [ 0, 0, 0, 0 ], 24 25 init : function( editor ) 25 26 { -
_source/skins/kama/cellProperties.css
1 /* 2 Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. 3 For licensing, see LICENSE.html or http://ckeditor.com/license 4 */ 5 6 /** 7 * Styles for the "cellProperties" plugin. 8 */ 9 10 .cke_skin_kama .cke_dialog_contents a.colorChooser 11 { 12 display:block; 13 margin-top:6px; 14 margin-left: 10px 15 } 16 17 .cke_skin_kama .cke_rtl .cke_dialog_contents a.colorChooser 18 { 19 margin-right: 10px; 20 } -
_source/plugins/dialog/plugin.js
903 903 children : contents.elements, 904 904 expand : !!contents.expand, 905 905 padding : contents.padding, 906 style : contents.style || 'width: 100%; height: 100%;'906 style : contents.style || 'width: 100%;' 907 907 }, pageHtml ); 908 908 909 909 // Create the HTML for the tab and the content block. -
_source/plugins/tabletools/dialogs/tableCell.js
8 8 var langTable = editor.lang.table, 9 9 langCell = langTable.cell, 10 10 langCommon = editor.lang.common, 11 rtlUI = editor.lang.dir == 'rtl', 11 12 validate = CKEDITOR.dialog.validate, 12 13 widthPattern = /^(\d+(?:\.\d+)?)(px|%)$/, 13 14 heightPattern = /^(\d+(?:\.\d+)?)px$/, 14 15 bind = CKEDITOR.tools.bind, 15 16 spacer = { type : 'html', html : ' ' }; 16 17 18 // Load skin at first. 19 CKEDITOR.skins.load( editor, 'cellProperties' ); 20 17 21 /** 18 22 * 19 23 * @param dialogName … … 71 75 72 76 return { 73 77 title : langCell.title, 74 minWidth : CKEDITOR.env.ie && CKEDITOR.env.quirks ? 550 : 480,75 minHeight : CKEDITOR.env.ie ? ( CKEDITOR.env.quirks ? 180 : 150 ) : 140,78 minWidth : CKEDITOR.env.ie && CKEDITOR.env.quirks? 450 : 400, 79 minHeight : CKEDITOR.env.ie && CKEDITOR.env.quirks? 220 : 200, 76 80 contents : [ 77 81 { 78 82 id : 'info', … … 98 102 { 99 103 type : 'text', 100 104 id : 'width', 105 width: '100px', 101 106 label : langTable.width, 102 widths : [ '71%', '29%' ],103 labelLayout : 'horizontal',104 107 validate : validate[ 'number' ]( langCell.invalidWidth ), 105 108 106 109 // Extra labelling of width unit type. … … 139 142 { 140 143 type : 'select', 141 144 id : 'widthType', 142 labelLayout : 'horizontal',143 widths : [ '0%', '100%' ],144 145 label : editor.lang.table.widthUnit, 145 labelStyle: ' display:none',146 labelStyle: 'visibility:hidden', 146 147 'default' : 'px', 147 148 items : 148 149 [ … … 166 167 { 167 168 type : 'text', 168 169 id : 'height', 170 width: '100px', 169 171 label : langTable.height, 170 172 'default' : '', 171 widths : [ '71%', '29%' ],172 labelLayout : 'horizontal',173 173 validate : validate[ 'number' ]( langCell.invalidHeight ), 174 174 175 175 // Extra labelling of height unit type. … … 206 206 { 207 207 id : 'htmlHeightType', 208 208 type : 'html', 209 html : langTable.widthPx209 html : '<br />'+ langTable.widthPx 210 210 } 211 211 ] 212 212 }, … … 214 214 { 215 215 type : 'select', 216 216 id : 'wordWrap', 217 labelLayout : 'horizontal',218 217 label : langCell.wordWrap, 219 widths : [ '50%', '50%' ],220 218 'default' : 'yes', 221 219 items : 222 220 [ … … 245 243 { 246 244 type : 'select', 247 245 id : 'hAlign', 248 labelLayout : 'horizontal',246 249 247 label : langCell.hAlign, 250 widths : [ '50%', '50%' ],251 248 'default' : '', 252 249 items : 253 250 [ … … 278 275 { 279 276 type : 'select', 280 277 id : 'vAlign', 281 labelLayout : 'horizontal',278 282 279 label : langCell.vAlign, 283 widths : [ '50%', '50%' ],284 280 'default' : '', 285 281 items : 286 282 [ … … 333 329 type : 'select', 334 330 id : 'cellType', 335 331 label : langCell.cellType, 336 labelLayout : 'horizontal', 337 widths : [ '50%', '50%' ], 332 338 333 'default' : 'td', 339 334 items : 340 335 [ … … 355 350 type : 'text', 356 351 id : 'rowSpan', 357 352 label : langCell.rowSpan, 358 labelLayout : 'horizontal', 359 widths : [ '50%', '50%' ], 353 360 354 'default' : '', 361 355 validate : validate.integer( langCell.invalidRowSpan ), 362 356 setup : function( selectedCell ) … … 378 372 type : 'text', 379 373 id : 'colSpan', 380 374 label : langCell.colSpan, 381 labelLayout : 'horizontal', 382 widths : [ '50%', '50%' ], 375 383 376 'default' : '', 384 377 validate : validate.integer( langCell.invalidColSpan ), 385 378 setup : function( element ) … … 401 394 { 402 395 type : 'hbox', 403 396 padding : 0, 404 widths : [ ' 80%', '20%' ],397 widths : [ '60%', '40%' ], 405 398 children : 406 399 [ 407 400 { 408 401 type : 'text', 409 402 id : 'bgColor', 410 403 label : langCell.bgColor, 411 labelLayout : 'horizontal',412 widths : [ '70%', '30%' ],413 404 'default' : '', 414 405 setup : function( element ) 415 406 { … … 433 424 { 434 425 type : 'button', 435 426 id : 'bgColorChoose', 427 "class" : 'colorChooser', 436 428 label : langCell.chooseColor, 437 style : 'margin-left: 10px',438 429 onClick : function() 439 430 { 440 431 var self = this; … … 448 439 } 449 440 ] 450 441 }, 451 spacer,452 442 { 453 443 type : 'hbox', 454 444 padding : 0, 455 widths : [ ' 80%', '20%' ],445 widths : [ '60%', '40%' ], 456 446 children : 457 447 [ 458 448 { 459 449 type : 'text', 460 450 id : 'borderColor', 461 451 label : langCell.borderColor, 462 labelLayout : 'horizontal',463 widths : [ '70%', '30%' ],464 452 'default' : '', 465 453 setup : function( element ) 466 454 { … … 483 471 { 484 472 type : 'button', 485 473 id : 'borderColorChoose', 474 "class" : 'colorChooser', 486 475 label : langCell.chooseColor, 487 style : 'margin-left: 10px',488 476 onClick : function() 489 477 { 490 478 var self = this; -
_source/skins/v2/skin.js
19 19 editor : { css : [ 'editor.css' ] }, 20 20 dialog : { css : [ 'dialog.css' ] }, 21 21 templates : { css : [ 'templates.css' ] }, 22 cellProperties : { css : [ 'cellProperties.css' ] }, 22 23 margins : [ 0, 14, 18, 14 ] 23 24 }; 24 25 })() ); -
_source/skins/v2/cellProperties.css
1 /* 2 Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. 3 For licensing, see LICENSE.html or http://ckeditor.com/license 4 */ 5 6 /** 7 * Styles for the "cellProperties" plugin. 8 */ 9 10 .cke_skin_v2 .cke_dialog_contents a.colorChooser 11 { 12 display:block; 13 margin-top:12px; 14 margin-left: 10px 15 } 16 17 .cke_skin_v2 .cke_rtl .cke_dialog_contents a.colorChooser 18 { 19 margin-right: 10px; 20 } -
_source/skins/office2003/skin.js
19 19 editor : { css : [ 'editor.css' ] }, 20 20 dialog : { css : [ 'dialog.css' ] }, 21 21 templates : { css : [ 'templates.css' ] }, 22 cellProperties : { css : [ 'cellProperties.css' ] }, 22 23 margins : [ 0, 14, 18, 14 ] 23 24 }; 24 25 })() ); -
_source/skins/office2003/cellProperties.css
1 /* 2 Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. 3 For licensing, see LICENSE.html or http://ckeditor.com/license 4 */ 5 6 /** 7 * Styles for the "cellProperties" plugin. 8 */ 9 10 .cke_skin_office2003 .cke_dialog_contents a.colorChooser 11 { 12 display:block; 13 margin-top:12px; 14 margin-left: 10px 15 } 16 17 .cke_skin_office2003 .cke_rtl .cke_dialog_contents a.colorChooser 18 { 19 margin-right: 10px; 20 }