Link Properties

Index: /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.body.php =================================================================== --- /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.body.php (revision 536) +++ /MediaWiki/trunk/extensions/FCKeditor/FCKeditor.body.php (revision 537) @@ -464,5 +464,5 @@ function stripNoGallery($text) {} function stripToc( $text ) { - $prefix = ''; + $prefix = ''; $suffix = ''; @@ -480,5 +480,5 @@ } function replaceVariables( $text, $args = array(), $argsOnly = false ) { - return preg_replace("/\{\{([^}]+)\}\}(\}*)/", '{{$1}}$2', $text); + return preg_replace("/\{\{([^}]+)\}\}(\}*)/", '{{$1}}$2', $text); } } Index: /MediaWiki/trunk/extensions/FCKeditor/fckeditor_config.js =================================================================== --- /MediaWiki/trunk/extensions/FCKeditor/fckeditor_config.js (revision 536) +++ /MediaWiki/trunk/extensions/FCKeditor/fckeditor_config.js (revision 537) @@ -12,5 +12,5 @@ ['Cut','Copy','Paste',/*'PasteText','PasteWord',*/'-','Print'], ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'], - ['SpecialChar','Table','Rule'], + ['SpecialChar','Table','Image','Rule'], '/', ['FontFormat'], @@ -44,3 +44,13 @@ FCKConfig.FlashUpload = false ; -FCKConfig.EditorAreaCSS = FCKConfig.EditorAreaCSS.split( ',' ) ; +FCKConfig.EditorAreaStyles = '\ +.FCK__MWTemplate \ +{ \ + border: 1px dotted #00F; \ + background-position: center center; \ + background-image: url(' + FCKConfig.PluginsPath + 'mediawiki/images/icon_template.gif); \ + background-repeat: no-repeat; \ + width: 20px; \ + height: 15px; \ + vertical-align: middle; \ +}' ; Index: /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/dialogs/fck_link.html =================================================================== --- /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/dialogs/fck_link.html (revision 537) +++ /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/dialogs/fck_link.html (revision 537) @@ -0,0 +1,231 @@ + + + + + Link Properties + + + + + + +

+ Link
+ +
+ Automatic search results (start typing in the above field)
+ +

+ + Index: /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/dialogs/template.html =================================================================== --- /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/dialogs/template.html (revision 537) +++ /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/dialogs/template.html (revision 537) @@ -0,0 +1,140 @@ + + + + + Template Properties + + + + + + +

+ + + + + + + +

+ Template raw definition (from {{ to }})
+

+ +

+ + Index: diaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/fck_link.html =================================================================== --- /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/fck_link.html (revision 536) +++ (revision ) @@ -1,231 +1,0 @@ - - - - - Link Properties - - - - - - -

- Link
- -
- Automatic search results (start typing in the above field)
- -

- - Index: /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/fckplugin.js =================================================================== --- /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/fckplugin.js (revision 536) +++ /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/fckplugin.js (revision 537) @@ -30,5 +30,6 @@ // Override some dialogs. -FCKCommands.RegisterCommand( 'Link', new FCKDialogCommand( 'Link', FCKLang.DlgLnkWindowTitle, FCKConfig.PluginsPath + 'mediawiki/fck_link.html', 400, 330 ) ) ; +FCKCommands.RegisterCommand( 'Link', new FCKDialogCommand( 'Link', FCKLang.DlgLnkWindowTitle, FCKConfig.PluginsPath + 'mediawiki/dialogs/fck_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/fck_image.html', 450, 400 ) ) ; @@ -116,5 +117,5 @@ // fake one (like the Flash placeholder image), so we must get the real one. if ( htmlNode.getAttribute('_fckfakelement') ) - return this._TransformToWikitext( FCK.GetRealElement( htmlNode ), stringBuilder ) ; + return this._AppendNode( FCK.GetRealElement( htmlNode ), stringBuilder ) ; // Mozilla insert custom nodes in the DOM. @@ -276,4 +277,11 @@ break ; + + case 'span' : + if ( htmlNode.className == 'fck_template' ) + { + stringBuilder.push( htmlNode.innerHTML ) ; + return ; + } default : @@ -436,3 +444,46 @@ })() ; - +// MediaWiki document processor (templates and magic words). +FCKDocumentProcessor.AppendNew().ProcessDocument = function( document ) +{ + var aSpans = document.getElementsByTagName( 'SPAN' ) ; + + var eSpan ; + var i = aSpans.length - 1 ; + while ( i >= 0 && ( eSpan = aSpans[i--] ) ) + { + var customAtt = null ; + + switch ( eSpan.className ) + { + case 'fck_mw_template' : + case 'fck_mw_magic' : + var oImg = FCKDocumentProcessor_CreateFakeImage( 'FCK__MWTemplate', eSpan.cloneNode(true) ) ; + oImg.setAttribute( '_' + eSpan.className, 'true', 0 ) ; + + eSpan.parentNode.insertBefore( oImg, eSpan ) ; + eSpan.parentNode.removeChild( eSpan ) ; + break ; + } + } +} + +// Context menu for templates. +FCK.ContextMenu.RegisterListener({ + AddItems : function( contextMenu, tag, tagName ) + { + if ( tagName == 'IMG' ) + { + if ( tag.getAttribute( '_fck_mw_template' ) ) + { + contextMenu.AddSeparator() ; + contextMenu.AddItem( 'MW_Template', 'Template Properties' ) ; + } + if ( tag.getAttribute( '_fck_mw_magic' ) ) + { + contextMenu.AddSeparator() ; + contextMenu.AddItem( 'MW_MagicWord', 'Modify Magic Word' ) ; + } + } + } +}) ;