Index: /MediaWiki/trunk/extensions/FCKeditor/FCKeditorParser.body.php =================================================================== --- /MediaWiki/trunk/extensions/FCKeditor/FCKeditorParser.body.php (revision 582) +++ /MediaWiki/trunk/extensions/FCKeditor/FCKeditorParser.body.php (revision 583) @@ -123,8 +123,8 @@ function ref( $str, $argv, $parser ) { if (empty($argv)) { - $ret = ""; + $ret = ""; } else { - $ret = "$value) { $ret .= " ".$key."=\"".$value."\""; @@ -137,5 +137,5 @@ else { $ret .= htmlspecialchars($str); - $ret .= ""; + $ret .= ""; } return $ret; @@ -150,8 +150,8 @@ function references( $str, $argv, $parser ) { if (empty($argv)) { - $ret = ""; + $ret = ""; } else { - $ret = "$value) { $ret .= " ".$key."=\"".$value."\""; @@ -164,5 +164,5 @@ else { $ret .= htmlspecialchars($str); - $ret .= ""; + $ret .= ""; } Index: /MediaWiki/trunk/extensions/FCKeditor/fckeditor_config.js =================================================================== --- /MediaWiki/trunk/extensions/FCKeditor/fckeditor_config.js (revision 582) +++ /MediaWiki/trunk/extensions/FCKeditor/fckeditor_config.js (revision 583) @@ -13,5 +13,5 @@ ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'], ['SpecialChar','Table','Image','Rule'], - ['MW_Template'], + ['MW_Template', 'MW_Ref'], '/', ['FontFormat'], @@ -31,17 +31,8 @@ FCKConfig.FontFormats = 'p;pre;h1;h2;h3;h4;h5;h6' ; -// Disable some advanced features. -FCKConfig.LinkDlgHideTarget = true ; -FCKConfig.LinkDlgHideAdvanced = true ; -FCKConfig.ImageDlgHideLink = true ; -FCKConfig.ImageDlgHideAdvanced = true ; -FCKConfig.FlashDlgHideAdvanced = true ; +FCKConfig.AutoDetectLanguage = false ; +FCKConfig.DefaultLanguage = 'en' ; -FCKConfig.LinkBrowser = false ; -FCKConfig.ImageBrowser = false ; -FCKConfig.FlashBrowser = false ; -FCKConfig.LinkUpload = false ; -FCKConfig.ImageUpload = false ; -FCKConfig.FlashUpload = false ; +// FCKConfig.DisableObjectResizing = true ; FCKConfig.EditorAreaStyles = '\ @@ -55,3 +46,24 @@ height: 15px; \ vertical-align: middle; \ -}' ; +} \ +.FCK__MWRef \ +{ \ + border: 1px dotted #00F; \ + background-position: center center; \ + background-image: url(' + FCKConfig.PluginsPath + 'mediawiki/images/icon_ref.gif); \ + background-repeat: no-repeat; \ + width: 18px; \ + height: 15px; \ + vertical-align: middle; \ +} \ +.FCK__MWReferences \ +{ \ + border: 1px dotted #00F; \ + background-position: center center; \ + background-image: url(' + FCKConfig.PluginsPath + 'mediawiki/images/icon_references.gif); \ + background-repeat: no-repeat; \ + width: 66px; \ + height: 15px; \ + vertical-align: middle; \ +} \ +' ; Index: /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/dialogs/ref.html =================================================================== --- /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/dialogs/ref.html (revision 583) +++ /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/dialogs/ref.html (revision 583) @@ -0,0 +1,124 @@ + + + + + Reference Properties + + + + + + +
+ + + + + + + + + + +
+ Reference text (Wikitext) +
+ +
+ Reference name (optional)
+ +
+
+ + Index: /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/dialogs/template.html =================================================================== --- /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/dialogs/template.html (revision 582) +++ /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/dialogs/template.html (revision 583) @@ -113,5 +113,5 @@ - + Index: /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/fckplugin.js =================================================================== --- /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/fckplugin.js (revision 582) +++ /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/fckplugin.js (revision 583) @@ -37,7 +37,12 @@ FCKToolbarItems.RegisterItem( 'MW_Template', tbButton ) ; +tbButton = new FCKToolbarButton( 'MW_Ref', 'Reference', 'Insert/Edit Reference' ) ; +tbButton.IconPath = FCKConfig.PluginsPath + 'mediawiki/images/tb_icon_ref.gif' ; +FCKToolbarItems.RegisterItem( 'MW_Ref', tbButton ) ; + // 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_Ref', new FCKDialogCommand( 'MW_Ref', 'Reference Properties', FCKConfig.PluginsPath + 'mediawiki/dialogs/ref.html', 400, 250 ) ) ; +FCKCommands.RegisterCommand( 'Link', new FCKDialogCommand( 'Link', FCKLang.DlgLnkWindowTitle, FCKConfig.PluginsPath + 'mediawiki/dialogs/link.html', 400, 250 ) ) ; FCKCommands.RegisterCommand( 'Image', new FCKDialogCommand( 'Image', FCKLang.DlgImgTitle, FCKConfig.PluginsPath + 'mediawiki/dialogs/image.html', 450, 300 ) ) ; @@ -285,9 +290,9 @@ break ; - + case 'img' : - + // Blue Flower Image - + var imgName = htmlNode.getAttribute( '_fck_mw_filename' ) ; var imgCaption = htmlNode.getAttribute( 'alt' ) || '' ; @@ -296,11 +301,11 @@ var imgWidth = htmlNode.getAttribute( '_fck_mw_width' ) || '' ; var imgHeight = htmlNode.getAttribute( '_fck_mw_height' ) || '' ; - - stringBuilder.push( '[[Image:' ) - stringBuilder.push( imgName ) - + + stringBuilder.push( '[[Image:' ) + stringBuilder.push( imgName ) + if ( imgType.length > 0 ) stringBuilder.push( '|' + imgType ) ; - + if ( imgLocation.length > 0 ) stringBuilder.push( '|' + imgLocation ) ; @@ -309,5 +314,5 @@ { stringBuilder.push( '|' + imgWidth ) ; - + if ( imgHeight.length > 0 ) stringBuilder.push( 'x' + imgHeight ) ; @@ -315,15 +320,37 @@ stringBuilder.push( 'px' ) ; } - + if ( imgCaption.length > 0 ) stringBuilder.push( '|' + imgCaption ) ; - - stringBuilder.push( ']]' ) - + + stringBuilder.push( ']]' ) + break ; - + case 'span' : switch ( htmlNode.className ) { + case 'fck_mw_ref' : + var refName = htmlNode.getAttribute( 'name' ) ; + + stringBuilder.push( ' 0 ) + stringBuilder.push( ' name="' + refName + '"' ) ; + + if ( htmlNode.innerHTML.length == 0 ) + stringBuilder.push( ' />' ) ; + else + { + stringBuilder.push( '>' ) ; + stringBuilder.push( htmlNode.innerHTML ) ; + stringBuilder.push( '' ) ; + } + return ; + + case 'fck_mw_references' : + stringBuilder.push( '' ) ; + return ; + case 'fck_mw_template' : case 'fck_mw_magic' : @@ -480,7 +507,8 @@ })() ; -// MediaWiki document processor (templates and magic words). +// MediaWiki document processor. FCKDocumentProcessor.AppendNew().ProcessDocument = function( document ) { + // Templates and magic words. var aSpans = document.getElementsByTagName( 'SPAN' ) ; @@ -489,11 +517,18 @@ while ( i >= 0 && ( eSpan = aSpans[i--] ) ) { - var customAtt = null ; - + var className = null ; switch ( eSpan.className ) { + case 'fck_mw_ref' : + className = 'FCK__MWRef' ; + case 'fck_mw_references' : + if ( className == null ) + className = 'FCK__MWReferences' ; case 'fck_mw_template' : case 'fck_mw_magic' : - var oImg = FCKDocumentProcessor_CreateFakeImage( 'FCK__MWTemplate', eSpan.cloneNode(true) ) ; + if ( className == null ) + className = 'FCK__MWTemplate' ; + + var oImg = FCKDocumentProcessor_CreateFakeImage( className, eSpan.cloneNode(true) ) ; oImg.setAttribute( '_' + eSpan.className, 'true', 0 ) ; @@ -521,4 +556,9 @@ contextMenu.AddItem( 'MW_MagicWord', 'Modify Magic Word' ) ; } + if ( tag.getAttribute( '_fck_mw_ref' ) ) + { + contextMenu.AddSeparator() ; + contextMenu.AddItem( 'MW_Ref', 'Reference Properties' ) ; + } } }