Index: /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.php =================================================================== --- /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.php (revision 581) +++ /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.php (revision 582) @@ -57,6 +57,6 @@ $wgExtensionCredits['other'][] = array( "name" => "FCKeditor extension", -"author" => "originally written by Mafs, extended by FCKeditor.net", -"version" => 'fck/mw-extension $Rev$ 2007', +"author" => "FCKeditor.net (inspired by the code written by Mafs [Meta])", +"version" => 'fckeditor/mw-extension $Rev$ 2007', "url" => "http://meta.wikimedia.org/wiki/FCKeditor", "description" => "FCKeditor extension" Index: /MediaWiki/trunk/extensions/FCKeditor/FCKeditorSkin.body.php =================================================================== --- /MediaWiki/trunk/extensions/FCKeditor/FCKeditorSkin.body.php (revision 581) +++ /MediaWiki/trunk/extensions/FCKeditor/FCKeditorSkin.body.php (revision 582) @@ -40,5 +40,5 @@ } else { - $ret .= "_fck_mw_valid=\"false"."\" "; + $ret .= "_fck_mw_valid=\"false"."\" "; } $ret .= "_fck_mw_filename=\"{$orginal}\" "; @@ -77,4 +77,8 @@ $class .= ($class?" ":"") . "fck_mw_right"; } + + if (!$found) { + $class .= ($class?" ":"") . "fck_mw_notfound"; + } if (!is_null($alt) && !empty($alt) && false !== strpos(FCKeditorParser::$fkc_mw_makeImage_options, $alt) && $alt != "Image:" . $orginal) { Index: /MediaWiki/trunk/extensions/FCKeditor/css/fckeditor.css =================================================================== --- /MediaWiki/trunk/extensions/FCKeditor/css/fckeditor.css (revision 581) +++ /MediaWiki/trunk/extensions/FCKeditor/css/fckeditor.css (revision 582) @@ -1608,2 +1608,44 @@ font-size: 90%; } + + +/** + * FCKeditor specific styles + */ + +img.fck_mw_frame +{ + background-color: #F9F9F9; + border: 1px solid #CCCCCC; + padding: 3px !important; +} + +img.fck_mw_right +{ + margin: 0.5em 5px 0.8em 1.4em ; + clear: right; + float: right; +} + +img.fck_mw_left +{ + margin: 0.5em 1.4em 0.8em 5px; + clear: left; + float: left; +} + +img.fck_mw_center +{ + margin-left: auto; + margin-right: auto; + margin-bottom: 0.5em; + display: block; +} + +img.fck_mw_notfound +{ + font-size: 1px; + height: 25px; + width: 25px; + overflow: hidden ; +} Index: /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/dialogs/image.html =================================================================== --- /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/dialogs/image.html (revision 582) +++ /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/dialogs/image.html (revision 582) @@ -0,0 +1,324 @@ + + + + + Image Properties + + + + + + +
+ + + + + + + + + + +
+ Image file name
+ +
+ Automatic search results (start typing in the above field)
+ +
+ Caption
+
+
+ + + + + + + +
+ Special Type
+ + 		+ Align
+ + 		+ Width
+ + 		+ Height
+ +
+
+
+ + Index: /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/fckplugin.js =================================================================== --- /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/fckplugin.js (revision 581) +++ /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/fckplugin.js (revision 582) @@ -22,6 +22,9 @@ * * Wikitext syntax reference: - * http://meta.wikimedia.org/wiki/Help:Wikitext_examples - * http://meta.wikimedia.org/wiki/Help:Advanced_editing + * http://meta.wikimedia.org/wiki/Help:Wikitext_examples + * http://meta.wikimedia.org/wiki/Help:Advanced_editing + * + * MediaWiki Sandbox: + * http://meta.wikimedia.org/wiki/Meta:Sandbox */ @@ -35,7 +38,7 @@ // Override some dialogs. +FCKCommands.RegisterCommand( 'MW_Template', new FCKDialogCommand( 'MW_Template', 'Template Properties', FCKConfig.PluginsPath + 'mediawiki/dialogs/template.html', 400, 330 ) ) ; FCKCommands.RegisterCommand( 'Link', new FCKDialogCommand( 'Link', FCKLang.DlgLnkWindowTitle, FCKConfig.PluginsPath + 'mediawiki/dialogs/link.html', 400, 330 ) ) ; -FCKCommands.RegisterCommand( 'MW_Template', new FCKDialogCommand( 'MW_Template', 'Template Properties', FCKConfig.PluginsPath + 'mediawiki/dialogs/template.html', 400, 330 ) ) ; -//FCKCommands.RegisterCommand( 'Image', new FCKDialogCommand( 'Image', FCKLang.DlgImgTitle, FCKConfig.PluginsPath + 'mediawiki/image.html', 450, 400 ) ) ; +FCKCommands.RegisterCommand( 'Image', new FCKDialogCommand( 'Image', FCKLang.DlgImgTitle, FCKConfig.PluginsPath + 'mediawiki/dialogs/image.html', 450, 300 ) ) ; // MediaWiki Wikitext Data Processor implementation. @@ -283,4 +286,41 @@ break ; + case 'img' : + + // Blue Flower Image + + var imgName = htmlNode.getAttribute( '_fck_mw_filename' ) ; + var imgCaption = htmlNode.getAttribute( 'alt' ) || '' ; + var imgType = htmlNode.getAttribute( '_fck_mw_type' ) || '' ; + var imgLocation = htmlNode.getAttribute( '_fck_mw_location' ) || '' ; + var imgWidth = htmlNode.getAttribute( '_fck_mw_width' ) || '' ; + var imgHeight = htmlNode.getAttribute( '_fck_mw_height' ) || '' ; + + stringBuilder.push( '[[Image:' ) + stringBuilder.push( imgName ) + + if ( imgType.length > 0 ) + stringBuilder.push( '|' + imgType ) ; + + if ( imgLocation.length > 0 ) + stringBuilder.push( '|' + imgLocation ) ; + + if ( imgWidth.length > 0 ) + { + stringBuilder.push( '|' + imgWidth ) ; + + if ( imgHeight.length > 0 ) + stringBuilder.push( 'x' + imgHeight ) ; + + stringBuilder.push( 'px' ) ; + } + + if ( imgCaption.length > 0 ) + stringBuilder.push( '|' + imgCaption ) ; + + stringBuilder.push( ']]' ) + + break ; + case 'span' : switch ( htmlNode.className )