jenkins-bot has submitted this change and it was merged.

Change subject: ExtendedEditBar: Fixed ids for testing
......................................................................


ExtendedEditBar: Fixed ids for testing

There were id collisions between ExtendedEditBar and the hidden
mw toolbar. Changed all ids to bs- prefix.

Change-Id: Id6dc58a4b643cd92eccfa5e7e38400f09c26f2d1
---
M ExtendedEditBar/ExtendedEditBar.class.php
M ExtendedEditBar/resources/bluespice.extendedEditBar.css
2 files changed, 34 insertions(+), 39 deletions(-)

Approvals:
  Robert Vogel: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/ExtendedEditBar/ExtendedEditBar.class.php 
b/ExtendedEditBar/ExtendedEditBar.class.php
index 28d0159..702e4b0 100644
--- a/ExtendedEditBar/ExtendedEditBar.class.php
+++ b/ExtendedEditBar/ExtendedEditBar.class.php
@@ -88,73 +88,70 @@
                        "{$sCell} 1\n| {$sRow} 1, {$sCell} 2\n| {$sRow} 1, 
{$sCell} 3\n|-\n|".
                        " {$sRow} 2, {$sCell} 1\n| {$sRow} 2, {$sCell} 2\n| 
{$sRow} 2, {$sCell} 3";
 
-               $aMWButtonCfgs = array(
-                       'mw-editbutton-bold' => array(
-                               'open'   => '\'\'\'',
-                               'close'  => '\'\'\'',
-                               'sample' => wfMessage( 'bold_sample' )->text(),
-                               'tip'    => wfMessage( 'bold_tip' )->text(),
-                               'key'    => 'B'
-                       ),
-                       'mw-editbutton-italic' => array(
+               $aButtonCfgs = array(
+                       'bs-editbutton-italic' => array(
                                'open'   => '\'\'',
                                'close'  => '\'\'',
                                'sample' => wfMessage( 'italic_sample' 
)->text(),
                                'tip'    => wfMessage( 'italic_tip' )->text(),
                                'key'    => 'I'
                        ),
-                       'mw-editbutton-link' => array(
+                       'bs-editbutton-link' => array(
                                'open'   => '[[',
                                'close'  => ']]',
                                'sample' => wfMessage( 'link_sample' )->text(),
                                'tip'    => wfMessage( 'link_tip' )->text(),
                                'key'    => 'L'
                        ),
-                       'mw-editbutton-extlink' => array(
+                       'bs-editbutton-extlink' => array(
                                'open'   => '[',
                                'close'  => ']',
                                'sample' => wfMessage( 'extlink_sample' 
)->text(),
                                'tip'    => wfMessage( 'extlink_tip' )->text(),
                                'key'    => 'X'
                        ),
-                       'mw-editbutton-headline' => array(
+                       'bs-editbutton-headline' => array(
                                'open'   => "\n== ",
                                'close'  => " ==\n",
                                'sample' => wfMessage( 'headline_sample' 
)->text(),
                                'tip'    => wfMessage( 'headline_tip' )->text(),
                                'key'    => 'H'
                        ),
-                       'mw-editbutton-image' => $imagesAvailable ? array(
+                       'bs-editbutton-image' => $imagesAvailable ? array(
                                'open'   => '[[' . $wgContLang->getNsText( 
NS_FILE ) . ':',
                                'close'  => ']]',
                                'sample' => wfMessage( 'image_sample' )->text(),
                                'tip'    => wfMessage( 'image_tip' )->text(),
                                'key'    => 'D',
                        ) : false,
-                       'mw-editbutton-media' => $imagesAvailable ? array(
+                       'bs-editbutton-media' => $imagesAvailable ? array(
                                'open'   => '[[' . $wgContLang->getNsText( 
NS_MEDIA ) . ':',
                                'close'  => ']]',
                                'sample' => wfMessage( 'media_sample' )->text(),
                                'tip'    => wfMessage( 'media_tip' )->text(),
                                'key'    => 'M'
                        ) : false,
-                       'mw-editbutton-math' => $wgUseTeX ? array(
+                       'bs-editbutton-math' => $wgUseTeX ? array(
                                'open'   => "<math>",
                                'close'  => "</math>",
                                'sample' => wfMessage( 'math_sample' )->text(),
                                'tip'    => wfMessage( 'math_tip' )->text(),
                                'key'    => 'C'
                        ) : false,
-                       'mw-editbutton-signature' => array(
+                       'bs-editbutton-signature' => array(
                                'open'   => '--~~~~',
                                'close'  => '',
                                'sample' => '',
                                'tip'    => wfMessage( 'sig_tip' )->text(),
                                'key'    => 'Y'
                        ),
-               );
-
-               $aBSButtonCfgs = array(
+                       'bs-editbutton-bold' => array(
+                               'open'   => '\'\'\'',
+                               'close'  => '\'\'\'',
+                               'sample' => wfMessage( 'bold_sample' )->text(),
+                               'tip'    => wfMessage( 'bold_tip' )->text(),
+                               'key'    => 'B'
+                       ),
                        'bs-editbutton-redirect' => array(
                                'tip' => 
wfMessage('bs-extendededitbar-redirecttip')->plain(),
                                'open' => "#REDIRECT [[",
@@ -217,28 +214,26 @@
                        ),
                );
 
-               $aButtonCfgs = $aMWButtonCfgs + $aBSButtonCfgs;
-
                $aRows = array(
                        array('editing' => array(), 'dialogs' => array(), 
'table' => array( 10 => 'bs-editbutton-table' )), //this is reserverd for 
BlueSpice dialogs
                        array(
                                'formatting' => array(
-                                       10 => 'mw-editbutton-bold',
-                                       20 => 'mw-editbutton-italic',
+                                       10 => 'bs-editbutton-bold',
+                                       20 => 'bs-editbutton-italic',
                                        30 => 'bs-editbutton-strike',
-                                       40 => 'mw-editbutton-headline',
+                                       40 => 'bs-editbutton-headline',
                                        50 => 'bs-editbutton-linebreak',
                                ),
                                'content' => array(
-                                       //10 => 'mw-editbutton-link',
-                                       //20 => 'mw-editbutton-extlink',
-                                       30 => 'mw-editbutton-strike',
-                                       //40 => 'mw-editbutton-image',
-                                       //50 => 'mw-editbutton-media',
+                                       //10 => 'bs-editbutton-link',
+                                       //20 => 'bs-editbutton-extlink',
+                                       30 => 'bs-editbutton-strike',
+                                       //40 => 'bs-editbutton-image',
+                                       //50 => 'bs-editbutton-media',
                                        60 => 'bs-editbutton-gallery',
                                ),
                                'misc' => array(
-                                       10 => 'mw-editbutton-signature',
+                                       10 => 'bs-editbutton-signature',
                                        20 => 'bs-editbutton-redirect',
                                        30 => 'bs-editbutton-comment',
                                )
diff --git a/ExtendedEditBar/resources/bluespice.extendedEditBar.css 
b/ExtendedEditBar/resources/bluespice.extendedEditBar.css
index e2b050d..fb514fd 100644
--- a/ExtendedEditBar/resources/bluespice.extendedEditBar.css
+++ b/ExtendedEditBar/resources/bluespice.extendedEditBar.css
@@ -35,47 +35,47 @@
        border: 1px solid #cfcfcf
 }
 
-#bs-extendededitbar #mw-editbutton-bold {
+#bs-extendededitbar #bs-editbutton-bold {
        /*@embed*/
        background-image: url(images/button_format-bold.png);
 }
 
-#bs-extendededitbar #mw-editbutton-italic {
+#bs-extendededitbar #bs-editbutton-italic {
        /*@embed*/
        background-image: url(images/button_format-italic.png);
 }
 
-#bs-extendededitbar #mw-editbutton-headline {
+#bs-extendededitbar #bs-editbutton-headline {
        /*@embed*/
        background-image: url(images/button_format-h2.png);
 }
 
-#bs-extendededitbar #mw-editbutton-link {
+#bs-extendededitbar #bs-editbutton-link {
        /*@embed*/
        background-image: url(images/button_internal-link.png);
 }
 
-#bs-extendededitbar #mw-editbutton-extlink {
+#bs-extendededitbar #bs-editbutton-extlink {
        /*@embed*/
        background-image: url(images/button_external-link.png);
 }
 
-#bs-extendededitbar #mw-editbutton-strike {
+#bs-extendededitbar #bs-editbutton-strike {
        /*@embed*/
        background-image: url(images/button_format-struck.png);
 }
 
-#bs-extendededitbar #mw-editbutton-image {
+#bs-extendededitbar #bs-editbutton-image {
        /*@embed*/
        background-image: url(images/button_filelink.png);
 }
 
-#bs-extendededitbar #mw-editbutton-media {
+#bs-extendededitbar #bs-editbutton-media {
        /*@embed*/
        background-image: url(images/button_medialink.png);
 }
 
-#bs-extendededitbar #mw-editbutton-signature {
+#bs-extendededitbar #bs-editbutton-signature {
        /*@embed*/
        background-image: url(images/button_signatur.png);
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/315916
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id6dc58a4b643cd92eccfa5e7e38400f09c26f2d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Mglaser <gla...@hallowelt.biz>
Gerrit-Reviewer: Dvogel hallowelt <daniel.vo...@hallowelt.com>
Gerrit-Reviewer: Ljonka <l.verhovs...@gmail.com>
Gerrit-Reviewer: Pwirth <wi...@hallowelt.biz>
Gerrit-Reviewer: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to