from:"Tweichart $Code Review$"

[MediaWiki-commits] [Gerrit] hide settings from wikiadmin settings for WidgetBar and User... - change (mediawiki...BlueSpiceExtensions)

2015-09-24 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/240657

Change subject: hide settings from wikiadmin settings for WidgetBar and 
UserSidebar
..

hide settings from wikiadmin settings for WidgetBar and UserSidebar

Change-Id: Icaa5d8c6f6a4e8f7149f4dbc5a8fdf081054910a
---
M UserSidebar/UserSidebar.class.php
M WidgetBar/WidgetBar.class.php
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/57/240657/1

diff --git a/UserSidebar/UserSidebar.class.php 
b/UserSidebar/UserSidebar.class.php
index b1c0c71..5ec7fc4 100644
--- a/UserSidebar/UserSidebar.class.php
+++ b/UserSidebar/UserSidebar.class.php
@@ -81,7 +81,7 @@
 
$wgAPIModules['sidebar'] = 'ApiSidebar';
 
-   BsConfig::registerVar( 'MW::UserSidebar::LinkToEdit', 
array('href' => '', 'content' => ''), BsConfig::LEVEL_USER, 
'bs-usersidebar-userpagesettings-link-title', 'link' );
+   BsConfig::registerVar( 'MW::UserSidebar::LinkToEdit', array ( 
'href' => '', 'content' => '' ), BsConfig::LEVEL_USER | BsConfig::NO_DEFAULT, 
'bs-usersidebar-userpagesettings-link-title', 'link' );
 
wfProfileOut( 'BS::'.__METHOD__ );
}
diff --git a/WidgetBar/WidgetBar.class.php b/WidgetBar/WidgetBar.class.php
index 84d9659..4033db9 100644
--- a/WidgetBar/WidgetBar.class.php
+++ b/WidgetBar/WidgetBar.class.php
@@ -73,7 +73,7 @@
$this->setHook( 'BeforePageDisplay' );
$this->setHook( 'EditFormPreloadText' );
 
-   BsConfig::registerVar( 'MW::WidgetBar::LinkToEdit', 
array('href' => '', 'content' => ''), BsConfig::LEVEL_USER, 
'bs-widgetbar-userpagesettings-link-title', 'link' );
+   BsConfig::registerVar( 'MW::WidgetBar::LinkToEdit', array ( 
'href' => '', 'content' => '' ), BsConfig::LEVEL_USER | BsConfig::NO_DEFAULT, 
'bs-widgetbar-userpagesettings-link-title', 'link' );
 
wfProfileOut( 'BS::'.__METHOD__ );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icaa5d8c6f6a4e8f7149f4dbc5a8fdf081054910a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart 

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

[MediaWiki-commits] [Gerrit] fix for umlaut problem when switching editors - change (mediawiki...BlueSpiceExtensions)

2015-09-22 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/240054

Change subject: fix for umlaut problem when switching editors
..

fix for umlaut problem when switching editors

Change-Id: Iefe30dec0858e646eac47346b833bd9909810772
---
M VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/54/240054/1

diff --git a/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js 
b/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
index ec6376d..22c6f61 100644
--- a/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
+++ b/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
@@ -596,8 +596,8 @@
}
}
 
-   if (type === "internal_link") {
-   if (target === label ) { //TinyMCE3: 
tinymce.activeEditor.dom.decode(label)
+   if ( type === "internal_link" ) {
+   if ( target === tinymce.DOM.decode( 
label ) ) { //TinyMCE3: tinymce.activeEditor.dom.decode(label)
linkwiki = "[[" + target + "]]";
} else {
linkwiki = "[[" + target + "|" 
+ label + "]]";

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iefe30dec0858e646eac47346b833bd9909810772
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_22
Gerrit-Owner: Tweichart 

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

[MediaWiki-commits] [Gerrit] fix for preview - change (mediawiki...BlueSpiceExtensions)

2015-09-21 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/239817

Change subject: fix for preview
..

fix for preview

flexiskin preview now works again, requests are now handled via a cookie

Change-Id: I0be0c60ee6ffdfe73a7235e895a4a7b07d111bfd
---
M Flexiskin/Flexiskin.class.php
1 file changed, 30 insertions(+), 5 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/17/239817/1

diff --git a/Flexiskin/Flexiskin.class.php b/Flexiskin/Flexiskin.class.php
index 7a2cbb3..468ee3a 100644
--- a/Flexiskin/Flexiskin.class.php
+++ b/Flexiskin/Flexiskin.class.php
@@ -70,17 +70,42 @@
 * Initialization of ArticleInfo extension
 */
public function initExt() {
-   global $wgOut, $wgUploadPath;
wfProfileIn( 'BS::' . __METHOD__ );
//$this->mCore->registerPermission('flexiskinchange');
BsConfig::registerVar( 'MW::Flexiskin::Active', "default", 
BsConfig::LEVEL_PUBLIC | BsConfig::TYPE_STRING | 
BsConfig::USE_PLUGIN_FOR_PREFS, 'bs-flexiskin-pref-active', 'select' );
BsConfig::registerVar( 'MW::Flexiskin::Logo', "", 
BsConfig::LEVEL_PUBLIC | BsConfig::TYPE_STRING | 
BsConfig::USE_PLUGIN_FOR_PREFS, 'bs-flexiskin-pref-logo', 'text' );
$sFlexiskin = $this->getRequest()->getVal( 'flexiskin' );
-   if ( $sFlexiskin || BsConfig::get( 'MW::Flexiskin::Active' ) != 
'' ) {
+   $sPreviewSkin = 
RequestContext::getMain()->getRequest()->getCookie( "sPreviewSkin", null, false 
);
+   $oResponse = $this->getRequest()->response();
+   $oRequest = $this->getRequest();
+   //this statemenet is just for setting the cookie, this is why 
we need to do some checks here
+   //check if the request comes via index.php, flexiskin is set in 
query and if you are in view mode (block some ajax requests)
+   if ( strpos( wfGetScriptUrl(), "index.php" ) !== false && 
$sFlexiskin != "" && $oRequest->getVal( 'action', 'view' ) == 'view' ) {
+   $bIsTemp = (bool) $oRequest->getBool( 'preview', false 
);
+   //is it in preview mode?
+   //set the cookie
+   if ( $bIsTemp ) {
+   $oResponse->setcookie( "sPreviewSkin", 
$sFlexiskin );
+   $sPreviewSkin = $sFlexiskin;
+   //or just unset it
+   } else {
+   $oResponse->setcookie( "sPreviewSkin", false, 1 
);
+   $sPreviewSkin = false;
+   }
+   }
+   $sFlexiskin = $sFlexiskin == '' ? $sPreviewSkin : $sFlexiskin;
+   if ( $sFlexiskin != "" || BsConfig::get( 
'MW::Flexiskin::Active' ) != '' || $sPreviewSkin ) {
$sId = $sFlexiskin != '' ? $sFlexiskin : BsConfig::get( 
'MW::Flexiskin::Active' );
-   if ( $sId != "default" ) {
-   $bIsTemp = $this->getRequest()->getBool( 
'preview', false );
-   $this->addCssFile( $sId, $bIsTemp );
+   if ( $sId != "default" || $sPreviewSkin !== false ) {
+   $this->addCssFile( $sId, $sPreviewSkin !== 
false );
+   if ( $sPreviewSkin ) {
+   //reset resource loader cache for 
preview
+   global $wgResourceLoaderMaxage;
+   $wgResourceLoaderMaxage = array (
+   'versioned' => array ( 'server' 
=> 1, 'client' => 1 ),
+   'unversioned' => array ( 
'server' => 1, 'client' => 1 ),
+   );
+   }
}
}
$this->mCore->registerPermission( 'flexiskinedit', array(), 
array( 'type' => 'global' ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0be0c60ee6ffdfe73a7235e895a4a7b07d111bfd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart 

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

[MediaWiki-commits] [Gerrit] made java applet optional - change (mediawiki...BlueSpiceExtensions)

2015-09-17 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/239043

Change subject: made java applet optional
..

made java applet optional

you can now choose via settings if you want to use the applet as the path picker

Change-Id: Ieb623caccae3d03efa370803e6e2d2896e23e3fe
---
M InsertLink/InsertLink.class.php
M InsertLink/i18n/de.json
M InsertLink/i18n/en.json
M InsertLink/i18n/qqq.json
M InsertLink/resources/BS.InsertLink/FormPanelFileLink.js
M InsertLink/resources/BS.InsertLink/Window.js
6 files changed, 21 insertions(+), 6 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/43/239043/1

diff --git a/InsertLink/InsertLink.class.php b/InsertLink/InsertLink.class.php
index 9fcdd7e..b11bdbe 100644
--- a/InsertLink/InsertLink.class.php
+++ b/InsertLink/InsertLink.class.php
@@ -73,6 +73,8 @@
$this->setHook( 'BSExtendedEditBarBeforeEditToolbar' );
$this->setHook( 'VisualEditorConfig' );
 
+   BsConfig::registerVar( 'MW::InsertLink::EnableJava', false, 
BsConfig::LEVEL_USER | BsConfig::TYPE_BOOL, 'bs-insertlink-pref-enable-java', 
'toggle' );
+
wfProfileOut('BS::InsertLink::initExt');
}
 
@@ -103,6 +105,7 @@
$aButtonCfgs['bs-editbutton-insertlink'] = array(
'tip' => wfMessage( 'bs-insertlink' )->plain()
);
+   $this->getOutput()->addJsConfigVars( 'bsInsertLinkEnableJava', 
BsConfig::get( 'MW::InsertLink::EnableJava' ) );
return true;
}
 
diff --git a/InsertLink/i18n/de.json b/InsertLink/i18n/de.json
index c38227e..812e333 100644
--- a/InsertLink/i18n/de.json
+++ b/InsertLink/i18n/de.json
@@ -6,7 +6,9 @@
]
},
"bs-insertlink-desc": "Über ein Dialogfeld werden Links, z.B. zu 
bestehenden Seiten, eingebunden",
+   "prefs-insertlink": "Link einfügen",
"bs-insertlink": "Link einfügen",
+   "bs-insertlink-pref-enable-java": "Aktiviere Java Applet",
"bs-insertlink-button-title": "Link einfügen/bearbeiten",
"bs-insertlink-dialog-title": "Link einfügen",
"bs-insertlink-tab-wiki-page": "Wiki-Seite",
diff --git a/InsertLink/i18n/en.json b/InsertLink/i18n/en.json
index 426b1ab..1b7fc56 100644
--- a/InsertLink/i18n/en.json
+++ b/InsertLink/i18n/en.json
@@ -6,7 +6,9 @@
]
},
"bs-insertlink-desc": "Dialog box to enter a link",
+   "prefs-insertlink": "Insert link",
"bs-insertlink": "Insert link",
+   "bs-insertlink-pref-enable-java": "Activate Java applet",
"bs-insertlink-button-title": "Insert/edit link",
"bs-insertlink-dialog-title": "Insert link",
"bs-insertlink-tab-wiki-page": "Wiki page",
diff --git a/InsertLink/i18n/qqq.json b/InsertLink/i18n/qqq.json
index c4acaa6..a647811 100644
--- a/InsertLink/i18n/qqq.json
+++ b/InsertLink/i18n/qqq.json
@@ -7,7 +7,9 @@
]
},
"bs-insertlink-desc": "Used in 
[{{canonicalurl:Special:WikiAdmin|mode=ExtensionInfo}} 
Special:WikiAdmin?mode=ExtensionInfo], description of insert link extension",
+   "prefs-avatars": "Used in 
[{{canonicalurl:Special:WikiAdmin|mode=Preferences}} 
Special:WikiAdmin?mode=Preferences], headline for insert link section in 
preferences.\n{{Identical|Insert link}}",
"bs-insertlink": "Tooltip for the button.\n{{Identical|Insert link}}",
+   "bs-insertlink-pref-enable-java": "Option in 
[{{canonicalurl:Special:WikiAdmin|mode=Preferences}} 
Special:WikiAdmin?mode=Preferences], label for usage of 
java:\n{{Identical|Generator}}",
"bs-insertlink-button-title": "The tooltip for the button that opens 
the dialog. It is shown on mouse over.",
"bs-insertlink-dialog-title": "The title of the dialog 
window.\n{{Identical|Insert link}}",
"bs-insertlink-tab-wiki-page": "The title of the tab containing the 
controls of a wiki page link.\n{{Identical|Wiki page}}",
diff --git a/InsertLink/resources/BS.InsertLink/FormPanelFileLink.js 
b/InsertLink/resources/BS.InsertLink/FormPanelFileLink.js
index 890bc5f..cbff325 100644
--- a/InsertLink/resources/BS.InsertLink/FormPanelFileLink.js
+++ b/InsertLink/resources/BS.InsertLink/FormPanelFileLink.js
@@ -13,10 +13,14 @@
 
 Ext.define( 'BS.InsertLink.FormPanelFileLink', {
extend: 'BS.InsertLink.FormPanelBase',
-   protocols: ['file:///'],
+   protocols: [ 'file:///' ],
+   bIsJavaEnabled: false,
beforeInitComponent: function() {
this.setTitle( mw.message('bs-insertlink-tab-ext-file').plain() 
);
-   this.on( 'beforeactivate', function(){
+   this.on( 'beforeactivate', function () {
+   if ( !this.bIsJavaEnabled ) {
+   return;
+   }
var applet = $("");

[MediaWiki-commits] [Gerrit] Readers: Fixed grid sorting - change (mediawiki...BlueSpiceExtensions)

2015-09-11 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/237591

Change subject: Readers: Fixed grid sorting
..

Readers: Fixed grid sorting

Sorting was not implemented.

Patch set 2

Change-Id: I8eef2ecd42d572f3de4ce1c4283669b6363808a2
---
M Readers/Readers.class.php
1 file changed, 29 insertions(+), 13 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/91/237591/1

diff --git a/Readers/Readers.class.php b/Readers/Readers.class.php
index f65c7fd..88f9516 100644
--- a/Readers/Readers.class.php
+++ b/Readers/Readers.class.php
@@ -265,7 +265,13 @@
$sSort = $oStoreParams->getSort( 'MAX(readers_ts)' );
$sDirection = $oStoreParams->getDirection();
 
-   if ( $sSort == 'user_page' ) $sSort = 'readers_user_name';
+   if ( $sSort == 'user_name' ) {
+   $sSort = 'readers_user_name';
+   } elseif ( $sSort == 'user_ts' ) {
+   $sSort = 'readers_ts';
+   } elseif ( $sSort == 'user_readers' ) {
+   $sSort = 'readers_user_name';
+   }
 
$oDbr = wfGetDB( DB_SLAVE );
$res = $oDbr->select(
@@ -365,21 +371,31 @@
$iLimit = $oStoreParams->getLimit();
$iStart = $oStoreParams->getStart();
$sSort = $oStoreParams->getSort( 'MAX(readers_ts)' );
+   $sDirection = $oStoreParams->getDirection();
 
-   if ( $sSort == 'user_page' ) $sSort = 'readers_user_name';
+   if ( $sSort == 'pv_page' ) {
+   $sSort = 'page_title';
+   } elseif ( $sSort == 'pv_ts' ) {
+   $sSort = 'MAX( readers_ts )';
+   }
 
$res = $oDbr->select(
-   array( 'bs_readers', 'page' ),
-   array( 'readers_page_id', 'MAX(readers_ts) as 
readers_ts' ),
-   array( 'readers_user_id' => $iUserID ),
-   __METHOD__,
-   array(
-   'GROUP BY' => 'readers_page_id',
-   'ORDER BY' => 'MAX(readers_ts) DESC',
-   'LIMIT' => $iLimit,
-   'OFFSET' => $iStart
-   ),
-   array( 'page' => array( 'INNER JOIN', 
'readers_page_id = page_id' ) )
+   array( 'page', 'bs_readers' ),
+   array(
+   'page_title', 'readers_page_id', 
'readers_user_name',
+   'MAX( readers_ts ) as readers_ts'
+   ),
+   array(
+   'readers_page_id = page_id',
+   'readers_user_id' => $iUserID
+   ),
+   __METHOD__,
+   array(
+   'GROUP BY' => 'readers_page_id',
+   'ORDER BY' => $sSort . " " . $sDirection,
+   'LIMIT' => $iLimit,
+   'OFFSET' => $iStart
+   )
);
 
$aPages = array();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8eef2ecd42d572f3de4ce1c4283669b6363808a2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart 
Gerrit-Reviewer: Dvogel hallowelt 

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

[MediaWiki-commits] [Gerrit] SmartList: Fixed issue with unescaped revision comment - change (mediawiki...BlueSpiceExtensions)

2015-09-11 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/237645

Change subject: SmartList: Fixed issue with unescaped revision comment
..

SmartList: Fixed issue with unescaped revision comment

When a revision comment contains HTML elements the output of the list got
destroyed. This patch fixes the issue.

Needs merge to master.

Change-Id: I9680323a5b5220adc280f65308c5dccb00cd8e23
---
M SmartList/SmartList.class.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/45/237645/1

diff --git a/SmartList/SmartList.class.php b/SmartList/SmartList.class.php
index 2bb18ec..8f78da3 100644
--- a/SmartList/SmartList.class.php
+++ b/SmartList/SmartList.class.php
@@ -920,7 +920,7 @@
$sTitle = $oTitle->getText();
if ( BsConfig::get('MW::SmartList::Comments' ) 
) {
$sComment = ( strlen( $row->comment ) > 
50 ) ? substr( $row->comment, 0, 50 ) . '...' : $row->comment;
-   $sComment = wfMessage( 
'bs-smartlist-comment' )->params( $sComment )->plain();
+   $sComment = wfMessage( 
'bs-smartlist-comment' )->params( $sComment )->escaped();
}
if ( isset( $aArgs['meta'] ) && $aArgs['meta'] 
== true ) {
$sMeta = ' - ('.$row->username.', 
'.$this->getLanguage()->date( $row->time, true, true ).')';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9680323a5b5220adc280f65308c5dccb00cd8e23
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart 
Gerrit-Reviewer: Robert Vogel 

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

[MediaWiki-commits] [Gerrit] cherry-pick from master - change (mediawiki...BlueSpiceExtensions)

2015-09-10 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/237379

Change subject: cherry-pick from master
..

cherry-pick from master

Change-Id: Ie64f2abb98d8d58d022d5226d2ddbd9c45d7262c
---
M UniversalExport/includes/UniversalExportHelper.class.php
1 file changed, 25 insertions(+), 26 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/79/237379/1

diff --git a/UniversalExport/includes/UniversalExportHelper.class.php 
b/UniversalExport/includes/UniversalExportHelper.class.php
index c569902..598858f 100644
--- a/UniversalExport/includes/UniversalExportHelper.class.php
+++ b/UniversalExport/includes/UniversalExportHelper.class.php
@@ -103,33 +103,33 @@
 
//HINT: http://calibre-ebook.com/user_manual/xpath.html
$oBodyContentXPath = new DOMXPath( $oPageDOM );
-   $oHeadingElements  = $oBodyContentXPath->query(
+   $oHeadingElements = $oBodyContentXPath->query(
"//*[contains(@class, 'firstHeading') "
-   ."or contains(@class, 'mw-headline') "
-   ."and not(contains(@class, 'mw-headline-'))]"
+   . "or contains(@class, 'mw-headline') "
+   . "and not(contains(@class, 'mw-headline-'))]"
);
 
//By convention the first  in the PageDOM is the title of 
the page
-   $oPageTitleBookmarkElement= $oBookmarksDOM->createElement( 
'bookmark' );
-   $oPageTitleHeadingElement = $oHeadingElements->item( 0 );
+   $oPageTitleBookmarkElement = $oBookmarksDOM->createElement( 
'bookmark' );
+   $oPageTitleHeadingElement = $oHeadingElements->item( 0 );
$sPageTitleHeadingTextContent = trim( 
$oPageTitleHeadingElement->textContent );
 
//By convention previousSibling is an Anchor-Tag (see 
BsPageContentProvider)
//TODO: check for null
$sPageTitleHeadingJumpmark = 
self::findPreviousDOMElementSibling( $oPageTitleHeadingElement, 'a' 
)->getAttribute( 'name' );
$oPageTitleBookmarkElement->setAttribute( 'name', 
$sPageTitleHeadingTextContent );
-   $oPageTitleBookmarkElement->setAttribute( 'href', 
'#'.$sPageTitleHeadingJumpmark );
+   $oPageTitleBookmarkElement->setAttribute( 'href', '#' . 
$sPageTitleHeadingJumpmark );
 
//Adapt MediaWiki TOC #1
$oTocTableElement = $oBodyContentXPath->query( "//*[@id='toc']" 
);
-   $oTableOfContentsAnchors = array();
+   $oTableOfContentsAnchors = array ();
if ( $oTocTableElement->length > 0 ) { //Is a TOC available?
// HINT: 
http://de.selfhtml.org/xml/darstellung/xpathsyntax.htm#position_bedingungen
// - recursive descent operator = getElementsByTag
$oTableOfContentsAnchors = $oBodyContentXPath->query( 
"//*[@id='toc']//a" );
-   $oTocTableElement->item( 0 )->setAttribute( 'id', 
'toc-'.$sPageTitleHeadingJumpmark ); //make id unique
-   $oTocTitleElement = $oBodyContentXPath->query( 
"//*[@id='toctitle']" )->item(0);
-   $oTocTitleElement->setAttribute( 'id', 
'toctitle-'.$sPageTitleHeadingJumpmark ); //make id unique;
+   $oTocTableElement->item( 0 )->setAttribute( 'id', 
'toc-' . $sPageTitleHeadingJumpmark ); //make id unique
+   $oTocTitleElement = $oBodyContentXPath->query( 
"//*[@id='toctitle']" )->item( 0 );
+   $oTocTitleElement->setAttribute( 'id', 'toctitle-' . 
$sPageTitleHeadingJumpmark ); //make id unique;
$oTocTitleElement->setAttribute( 'class', 'toctitle' );
}
 
@@ -137,31 +137,30 @@
$oParentBookmark = $oPageTitleBookmarkElement;
$iParentLevel = 0;
$aHeadingLevels = array_flip(
-   array( 'h1', 'h2', 'h3', 'h4', 'h5', 'h6' )
+   array ( 'h1', 'h2', 'h3', 'h4', 'h5', 'h6' )
);
for ( $i = 1; $i < $oHeadingElements->length; $i++ ) {
-   $oHeadingElement = $oHeadingElements->item( $i );
+   $oHeadingElement = $oHeadingElements->item( $i );
$sHeadingTextContent = trim( 
$oHeadingElement->textContent );
//In $sPageTitleHeadingJumpmark there is the PageTitle 
AND the RevisionId incorporated
-   $sHeadingJumpmark= 'bs-ue-jumpmark-'.md5( 
$sPageTitleHeadingJumpmark.$sHeadingTextContent );
+   $sHeadingJumpmark = 'bs-ue-jumpmark-' . md5( 
$sPageTitleHeadingJumpmark . $sHeadingTextContent );
 
$oBookmarkElement =

[MediaWiki-commits] [Gerrit] fixed bug with tables on first page - change (mediawiki...BlueSpiceExtensions)

2015-09-10 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/237393

Change subject: fixed bug with tables on first page
..

fixed bug with tables on first page

(cherry pick from  I4da80816da93375e6a17008c7615c88ec1e8cc3c)

Change-Id: I10e79207dc8aafafbad9037e87fe2e3af785b548
---
M UEModulePDF/data/PDFTemplates/common/stylesheets/page.css
1 file changed, 0 insertions(+), 9 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/93/237393/1

diff --git a/UEModulePDF/data/PDFTemplates/common/stylesheets/page.css 
b/UEModulePDF/data/PDFTemplates/common/stylesheets/page.css
index 8bc11de..1bb7563 100644
--- a/UEModulePDF/data/PDFTemplates/common/stylesheets/page.css
+++ b/UEModulePDF/data/PDFTemplates/common/stylesheets/page.css
@@ -161,13 +161,4 @@
 table {
 clear: both; /* Is this wise? Prevents floating thumbs from overlapping 
into tables and TOC table */
 -fs-table-paginate: paginate; /* special xhtmlrenderer (flying saucer -> 
fs) property */
-page-break-inside: avoid;
-}
-
-thead {
-page-break-after: avoid;
-}
-
-tbody {
-inside: avoid;
 }
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I10e79207dc8aafafbad9037e87fe2e3af785b548
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart 

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

[MediaWiki-commits] [Gerrit] fixed bug with tables on first page - change (mediawiki...BlueSpiceExtensions)

2015-09-10 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/237395

Change subject: fixed bug with tables on first page
..

fixed bug with tables on first page

(cherry pick from  I4da80816da93375e6a17008c7615c88ec1e8cc3c)

Change-Id: I10e79207dc8aafafbad9037e87fe2e3af785b548
---
M UEModulePDF/data/PDFTemplates/common/stylesheets/page.css
1 file changed, 0 insertions(+), 9 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/95/237395/1

diff --git a/UEModulePDF/data/PDFTemplates/common/stylesheets/page.css 
b/UEModulePDF/data/PDFTemplates/common/stylesheets/page.css
index 8bc11de..1bb7563 100644
--- a/UEModulePDF/data/PDFTemplates/common/stylesheets/page.css
+++ b/UEModulePDF/data/PDFTemplates/common/stylesheets/page.css
@@ -161,13 +161,4 @@
 table {
 clear: both; /* Is this wise? Prevents floating thumbs from overlapping 
into tables and TOC table */
 -fs-table-paginate: paginate; /* special xhtmlrenderer (flying saucer -> 
fs) property */
-page-break-inside: avoid;
-}
-
-thead {
-page-break-after: avoid;
-}
-
-tbody {
-inside: avoid;
 }
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I10e79207dc8aafafbad9037e87fe2e3af785b548
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_22
Gerrit-Owner: Tweichart 

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

[MediaWiki-commits] [Gerrit] cherry-pick from master - change (mediawiki...BlueSpiceExtensions)

2015-09-10 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/237378

Change subject: cherry-pick from master
..

cherry-pick from master

Change-Id: Ie64f2abb98d8d58d022d5226d2ddbd9c45d7262c
---
M UniversalExport/includes/UniversalExportHelper.class.php
1 file changed, 25 insertions(+), 26 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/78/237378/1

diff --git a/UniversalExport/includes/UniversalExportHelper.class.php 
b/UniversalExport/includes/UniversalExportHelper.class.php
index c569902..598858f 100644
--- a/UniversalExport/includes/UniversalExportHelper.class.php
+++ b/UniversalExport/includes/UniversalExportHelper.class.php
@@ -103,33 +103,33 @@
 
//HINT: http://calibre-ebook.com/user_manual/xpath.html
$oBodyContentXPath = new DOMXPath( $oPageDOM );
-   $oHeadingElements  = $oBodyContentXPath->query(
+   $oHeadingElements = $oBodyContentXPath->query(
"//*[contains(@class, 'firstHeading') "
-   ."or contains(@class, 'mw-headline') "
-   ."and not(contains(@class, 'mw-headline-'))]"
+   . "or contains(@class, 'mw-headline') "
+   . "and not(contains(@class, 'mw-headline-'))]"
);
 
//By convention the first  in the PageDOM is the title of 
the page
-   $oPageTitleBookmarkElement= $oBookmarksDOM->createElement( 
'bookmark' );
-   $oPageTitleHeadingElement = $oHeadingElements->item( 0 );
+   $oPageTitleBookmarkElement = $oBookmarksDOM->createElement( 
'bookmark' );
+   $oPageTitleHeadingElement = $oHeadingElements->item( 0 );
$sPageTitleHeadingTextContent = trim( 
$oPageTitleHeadingElement->textContent );
 
//By convention previousSibling is an Anchor-Tag (see 
BsPageContentProvider)
//TODO: check for null
$sPageTitleHeadingJumpmark = 
self::findPreviousDOMElementSibling( $oPageTitleHeadingElement, 'a' 
)->getAttribute( 'name' );
$oPageTitleBookmarkElement->setAttribute( 'name', 
$sPageTitleHeadingTextContent );
-   $oPageTitleBookmarkElement->setAttribute( 'href', 
'#'.$sPageTitleHeadingJumpmark );
+   $oPageTitleBookmarkElement->setAttribute( 'href', '#' . 
$sPageTitleHeadingJumpmark );
 
//Adapt MediaWiki TOC #1
$oTocTableElement = $oBodyContentXPath->query( "//*[@id='toc']" 
);
-   $oTableOfContentsAnchors = array();
+   $oTableOfContentsAnchors = array ();
if ( $oTocTableElement->length > 0 ) { //Is a TOC available?
// HINT: 
http://de.selfhtml.org/xml/darstellung/xpathsyntax.htm#position_bedingungen
// - recursive descent operator = getElementsByTag
$oTableOfContentsAnchors = $oBodyContentXPath->query( 
"//*[@id='toc']//a" );
-   $oTocTableElement->item( 0 )->setAttribute( 'id', 
'toc-'.$sPageTitleHeadingJumpmark ); //make id unique
-   $oTocTitleElement = $oBodyContentXPath->query( 
"//*[@id='toctitle']" )->item(0);
-   $oTocTitleElement->setAttribute( 'id', 
'toctitle-'.$sPageTitleHeadingJumpmark ); //make id unique;
+   $oTocTableElement->item( 0 )->setAttribute( 'id', 
'toc-' . $sPageTitleHeadingJumpmark ); //make id unique
+   $oTocTitleElement = $oBodyContentXPath->query( 
"//*[@id='toctitle']" )->item( 0 );
+   $oTocTitleElement->setAttribute( 'id', 'toctitle-' . 
$sPageTitleHeadingJumpmark ); //make id unique;
$oTocTitleElement->setAttribute( 'class', 'toctitle' );
}
 
@@ -137,31 +137,30 @@
$oParentBookmark = $oPageTitleBookmarkElement;
$iParentLevel = 0;
$aHeadingLevels = array_flip(
-   array( 'h1', 'h2', 'h3', 'h4', 'h5', 'h6' )
+   array ( 'h1', 'h2', 'h3', 'h4', 'h5', 'h6' )
);
for ( $i = 1; $i < $oHeadingElements->length; $i++ ) {
-   $oHeadingElement = $oHeadingElements->item( $i );
+   $oHeadingElement = $oHeadingElements->item( $i );
$sHeadingTextContent = trim( 
$oHeadingElement->textContent );
//In $sPageTitleHeadingJumpmark there is the PageTitle 
AND the RevisionId incorporated
-   $sHeadingJumpmark= 'bs-ue-jumpmark-'.md5( 
$sPageTitleHeadingJumpmark.$sHeadingTextContent );
+   $sHeadingJumpmark = 'bs-ue-jumpmark-' . md5( 
$sPageTitleHeadingJumpmark . $sHeadingTextContent );
 
$oBookmarkElement =

[MediaWiki-commits] [Gerrit] fixed bug with tables on first page - change (mediawiki...BlueSpiceExtensions)

2015-09-10 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/237382

Change subject: fixed bug with tables on first page
..

fixed bug with tables on first page

Change-Id: I4da80816da93375e6a17008c7615c88ec1e8cc3c
---
M UEModulePDF/data/PDFTemplates/common/stylesheets/page.css
1 file changed, 0 insertions(+), 9 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/82/237382/1

diff --git a/UEModulePDF/data/PDFTemplates/common/stylesheets/page.css 
b/UEModulePDF/data/PDFTemplates/common/stylesheets/page.css
index 4bc8fa4..8649993 100644
--- a/UEModulePDF/data/PDFTemplates/common/stylesheets/page.css
+++ b/UEModulePDF/data/PDFTemplates/common/stylesheets/page.css
@@ -163,13 +163,4 @@
 table {
clear: both; /* Is this wise? Prevents floating thumbs from overlapping 
into tables and TOC table */
-fs-table-paginate: paginate; /* special xhtmlrenderer (flying saucer 
-> fs) property */
-   page-break-inside: avoid;
-}
-
-thead {
-   page-break-after: avoid;
-}
-
-tbody {
-   inside: avoid;
 }
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4da80816da93375e6a17008c7615c88ec1e8cc3c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart 

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

[MediaWiki-commits] [Gerrit] SmartList: Fixed issue with whitspace on category filter - change (mediawiki...BlueSpiceExtensions)

2015-09-07 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/236525

Change subject: SmartList: Fixed issue with whitspace on category filter
..

SmartList: Fixed issue with whitspace on category filter

makeCategoriesFilterCondition: categorie names trimmed and whitespace
replaced with underscore.

patchset2: removing illegal category names

Change-Id: Idbfcbbe4019ae29852b1beba2e236429a7c9bdf2
---
M SmartList/SmartList.class.php
1 file changed, 6 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/25/236525/1

diff --git a/SmartList/SmartList.class.php b/SmartList/SmartList.class.php
index 13efda7..2bb18ec 100644
--- a/SmartList/SmartList.class.php
+++ b/SmartList/SmartList.class.php
@@ -808,7 +808,6 @@
} elseif( $aArgs['mode'] == 'whatlinkshere' ) {
//PW(25.02.2015) TODO:
//There could be filters - see Special:Whatlinkshere
-
$oTargetTitle = empty( $aArgs['target'] )
? $this->getContext()->getTitle()
: Title::newFromText( $aArgs['target'] )
@@ -1333,8 +1332,12 @@
$aCategories = explode( ',', $aArgs['categories'] );
$iCnt = count( $aCategories );
for ( $i = 0; $i < $iCnt; $i++ ) {
-   $aCategories[$i] = str_replace( ' ', '_', 
$aCategories[$i] );
-   $aCategories[$i] = "'" . trim( ucfirst( 
$aCategories[$i] ) ) . "'";
+   $oCategory = Category::newFromName( trim( 
$aCategories[$i] ) );
+   if( $oCategory === false ) {
+   unset( $aCategories[$i] );
+   continue;
+   }
+   $aCategories[$i] = "'" . $oCategory->getName() 
. "'" ;
}
$aArgs['categories'] = implode( ',', $aCategories );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idbfcbbe4019ae29852b1beba2e236429a7c9bdf2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart 
Gerrit-Reviewer: Dvogel hallowelt 

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

[MediaWiki-commits] [Gerrit] BsCommonAJAXInterface: Fixed issue with special Characters - change (mediawiki...BlueSpiceFoundation)

2015-09-04 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/236006

Change subject: BsCommonAJAXInterface: Fixed issue with special Characters
..

BsCommonAJAXInterface: Fixed issue with special Characters

Function getTitleStoreData replaced strtolower with
SearchEngine::normalizeText because strtolower is not compatible to
multibyte characters.

Change-Id: I5a585a1fbd97cdcc3633c07d21463466cb1e2b16
---
M includes/CommonAJAXInterface.php
1 file changed, 4 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/06/236006/1

diff --git a/includes/CommonAJAXInterface.php b/includes/CommonAJAXInterface.php
index 8cc321b..c383da8 100644
--- a/includes/CommonAJAXInterface.php
+++ b/includes/CommonAJAXInterface.php
@@ -98,9 +98,10 @@
// so multi term queries also bring results
$sOp = $dbr->anyString();
$aLike = array( '', $sOp );
-   $sParams = explode( ' ', strtolower( $oQueryTitle->getText() ) 
);
-   foreach ( $sParams as $sParam ) {
-   $aLike[] = $sParam;
+   $aParams = explode( ' ', $oQueryTitle->getText() );
+   $oSearchEngine = SearchEngine::create();
+   foreach ( $aParams as $sParam ) {
+   $aLike[] = $oSearchEngine->normalizeText( $sParam );
$aLike[] = $sOp;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a585a1fbd97cdcc3633c07d21463466cb1e2b16
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart 
Gerrit-Reviewer: Dvogel hallowelt 

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

[MediaWiki-commits] [Gerrit] SmartList: fixed whitespace error in toplist - change (mediawiki...BlueSpiceExtensions)

2015-09-04 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/235997

Change subject: SmartList: fixed whitespace error in toplist
..

SmartList: fixed whitespace error in toplist

Categories with whitespaces were not recognized. User had to use _
instead. This problem is fixed.

Change-Id: Ifc0d0deda4435f6505d0e7906fa32cd369afcaf1
---
M SmartList/SmartList.class.php
1 file changed, 15 insertions(+), 10 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/97/235997/1

diff --git a/SmartList/SmartList.class.php b/SmartList/SmartList.class.php
index e712725..0390363 100644
--- a/SmartList/SmartList.class.php
+++ b/SmartList/SmartList.class.php
@@ -1100,23 +1100,19 @@
}
 
if ( !empty( $sCat ) ) {
-   if ( substr_count( $sCat , ',') > 0 ) {
-   $aCategories = explode( ',', $sCat );
-   $aCategories = array_map( 'trim', $aCategories 
);
-   $sCategory = $aCategories[0];
-   } else {
-   $sCategory = $sCat;
-   }
+   $aCategories = explode( ',', $sCat );
+   $aCategories = array_map('trim', $aCategories);
+   $aCategories = str_replace(' ', '_',$aCategories);
 
if ( $bAlltime === false ) {
$aColumns[] = 'wo_page_id';
$aJoinConditions = array( 'categorylinks' => 
array( 'INNER JOIN ', 'wo_page_id = cl_from' ) );
$aTables[]= 'categorylinks';
-   $aConditions['cl_to'] = $sCategory;
+   $aConditions['cl_to'] = $aCategories;
} else {
$aTables[]= 'categorylinks';
$aConditions[]= 'page_id = cl_from';
-   $aConditions['cl_to'] = $sCategory;
+   $aConditions['cl_to'] = $aCategories;
}
}
 
@@ -1150,6 +1146,7 @@
}
 
$aList = array();
+   $aInList = array();
$iCurrCount = 0;
if ( $bAlltime === false ) {
foreach ( $res as $row ) {
@@ -1166,7 +1163,10 @@
continue;
}
}
-
+   if( in_array( 
$oTitle->getPrefixedText(), $aInList ) ) {
+   continue;
+   }
+   $aInList[] = $oTitle->getPrefixedText();
$sLink = BsLinkProvider::makeLink( 
$oTitle );
$aList[''. $sLink . ' (' . 
$row->page_counter . ')'] = (int)$row->page_counter;
$iCurrCount++;
@@ -1189,6 +1189,11 @@
if ( !empty( $aResult ) ) 
continue;
}
 
+   if( in_array( 
$oTitle->getPrefixedText(), $aInList ) ) {
+   continue;
+   }
+   $aInList[] = $oTitle->getPrefixedText();
+
$sLink = BsLinkProvider::makeLink( 
$oTitle );
$aList[] = '' . $sLink . ' (' . 
$row->page_counter . ')';
$iCurrCount++;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc0d0deda4435f6505d0e7906fa32cd369afcaf1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart 
Gerrit-Reviewer: Dvogel hallowelt 

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

[MediaWiki-commits] [Gerrit] [RFC] dom changes for better seo - change (mediawiki...BlueSpiceSkin)

2015-09-03 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/235688

Change subject: [RFC] dom changes for better seo
..

[RFC] dom changes for better seo

* top navigation moved (now after content)
* content actions moved (now after content)
* added css for same display as before

Change-Id: I61dbb64d4f5927a77af5a284b32f1032fc488368
---
M BlueSpiceSkin.skin.php
M resources/components/skin.contentActions.less
M resources/components/skin.menuTop.less
M resources/screen.layout.less
4 files changed, 56 insertions(+), 41 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin 
refs/changes/88/235688/1

diff --git a/BlueSpiceSkin.skin.php b/BlueSpiceSkin.skin.php
index 4ee22d1..811e804 100644
--- a/BlueSpiceSkin.skin.php
+++ b/BlueSpiceSkin.skin.php
@@ -70,20 +70,9 @@
wfSuppressWarnings();
?>

-   
-   printLogo(); ?>
-   
-   printNavigationSites(); ?>
-   
-   
-   printPersonalTools(); ?>
-   printSearchBox(); ?>
-   
-   



-   printContentActions(); ?>
printDataBeforeContent(); 
?>


@@ -116,6 +105,7 @@
html( 
'debughtml' ); ?>


+   printContentActions(); ?>
printDataAfterContent(); ?>


@@ -125,35 +115,43 @@



-   html('userlangattributes') ?>>
-   getFooterIcons("icononly");
-   $aFooterLinks = $this->getFooterLinks();
-   foreach ($aFooterLinks as $sCategory => $aLinks):
-   ?>
-   
-   ' . $this->data[$sLink] . '';
-   }
-   ?>
-   
-   
-0):
-   ?>
-   
-$aFooterIconBlock ): ?>
-   
-   
-   
getSkin()->makeFooterIcon($icon); ?>
-   
-   
-   
-   
-   
+   html('userlangattributes') ?>>
+   getFooterIcons("icononly");
+   $aFooterLinks = $this->getFooterLinks();
+   foreach ($aFooterLinks as $sCategory => 
$aLinks):
+   ?>
+   
+   ' . $this->data[$sLink] . '';
+   }
+   ?>
+   
+   
+0): ?>
+   
+$aFooterIconBlock ): ?>
+   
+   
+   getSkin()->makeFooterIcon($icon); ?>
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   printLogo(); ?>
+   
+

[MediaWiki-commits] [Gerrit] BSSkin: Fixed title tooltip for watch content action - change (mediawiki...BlueSpiceSkin)

2015-08-31 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/234951

Change subject: BSSkin: Fixed title tooltip for watch content action
..

BSSkin: Fixed title tooltip for watch content action

Change-Id: I1b72eafd22d648d88d5051d7d6b5a75994a64c11
---
M resources/components/skin.contentActions.less
1 file changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin 
refs/changes/51/234951/1

diff --git a/resources/components/skin.contentActions.less 
b/resources/components/skin.contentActions.less
index 1c2fc25..4e5eb1d 100644
--- a/resources/components/skin.contentActions.less
+++ b/resources/components/skin.contentActions.less
@@ -54,12 +54,14 @@
margin-right: 8px;
color: @bs-color-dark-blue;
a{
-   width: 13px;
-   height: 13px;
+   display: block;
+   position: relative;
+   width: 15px;
+   height: 16px;
overflow: hidden;
margin-top: -13px;
padding: 0;
-   text-indent: 20px;
+   text-indent: -178px;
}
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b72eafd22d648d88d5051d7d6b5a75994a64c11
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart 
Gerrit-Reviewer: Pwirth 

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

[MediaWiki-commits] [Gerrit] changes styling for atom icon to be displayed correctly in l... - change (mediawiki...BlueSpiceSkin)

2015-08-31 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/234952

Change subject: changes styling for atom icon to be displayed correctly in left 
navigation
..

changes styling for atom icon to be displayed correctly in left navigation

Change-Id: I92d6c85083e049526c86c7c9405438e11cb6d590
(cherry picked from commit a6c3a4b6f1f9ef6fb97ca6c6079e158fd424ffde)
---
M resources/components/skin.icons.less
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin 
refs/changes/52/234952/1

diff --git a/resources/components/skin.icons.less 
b/resources/components/skin.icons.less
index b9c4fa0..6a3ed1a 100644
--- a/resources/components/skin.icons.less
+++ b/resources/components/skin.icons.less
@@ -55,6 +55,10 @@
.bs-nav-item-text {
line-height: 22px; /* Has to be lower than icon height. 
Otherwise the text may break ugly */
}
+   a.feedlink{
+   padding-left: 15px;
+   line-height: 24px;
+   }
}
 
li#n-mainpage,
@@ -111,4 +115,4 @@
 .icon-search-light:before {
content: "\e680";
color: #fff;
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I92d6c85083e049526c86c7c9405438e11cb6d590
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart 

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

[MediaWiki-commits] [Gerrit] fix for search scope on special page, buttons were ignored, ... - change (mediawiki...BlueSpiceExtensions)

2015-08-28 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/234471

Change subject: fix for search scope on special page, buttons were ignored, see 
issue #892
..

fix for search scope on special page, buttons were ignored, see issue #892

Change-Id: I9b69367446455c2715eb528ceb810458c08d79c7
---
M ExtendedSearch/includes/SearchIndex/SearchOptions.class.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/71/234471/1

diff --git a/ExtendedSearch/includes/SearchIndex/SearchOptions.class.php 
b/ExtendedSearch/includes/SearchIndex/SearchOptions.class.php
index 79c8d99..c10aba2 100644
--- a/ExtendedSearch/includes/SearchIndex/SearchOptions.class.php
+++ b/ExtendedSearch/includes/SearchIndex/SearchOptions.class.php
@@ -289,7 +289,8 @@
$aFq = array();
$aBq = array();
 
-   $scope = ( BsConfig::get( 'MW::ExtendedSearch::DefScopeUser' ) 
== 'title' )
+   $oRequest = RequestContext::getMain()-getRequest();
+   $scope = $oRequest-getVal( 'search_scope', BsConfig::get( 
'MW::ExtendedSearch::DefScopeUser' ) ) == 'title' 
? 'title'
: 'text';
$this-aOptions['scope'] = $scope;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b69367446455c2715eb528ceb810458c08d79c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] window now sets the component to loading when ok is clicked - change (mediawiki...BlueSpiceFoundation)

2015-08-25 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/233675

Change subject: window now sets the component to loading when ok is clicked
..

window now sets the component to loading when ok is clicked

Change-Id: I75efab916597761bda1fc30ff4c7d9cffbb4281c
---
M resources/bluespice.extjs/BS/Window.js
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/75/233675/1

diff --git a/resources/bluespice.extjs/BS/Window.js 
b/resources/bluespice.extjs/BS/Window.js
index 796b6f6..3fc13e3 100755
--- a/resources/bluespice.extjs/BS/Window.js
+++ b/resources/bluespice.extjs/BS/Window.js
@@ -70,7 +70,12 @@
afterInitComponent: function() {

},
-   onBtnOKClick: function() {
+   show: function () {
+   this.setLoading( false );
+   this.callParent( arguments );
+   },
+   onBtnOKClick: function () {
+   this.setLoading( true );
this.fireEvent( 'ok', this, this.getData() );
this.close();
},

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I75efab916597761bda1fc30ff4c7d9cffbb4281c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] BSF DefaultSettings: Added blog.hallowelt.com to $wgRSSUrlWh... - change (mediawiki...BlueSpiceFoundation)

2015-08-24 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/233350

Change subject: BSF DefaultSettings: Added blog.hallowelt.com to 
$wgRSSUrlWhitelist
..

BSF DefaultSettings: Added blog.hallowelt.com to $wgRSSUrlWhitelist

Change-Id: Ibc6f94d58c78b520f6ca32a392fa650029605499
---
M includes/DefaultSettings.php
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/50/233350/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index a9165f7..c38d260 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -35,7 +35,10 @@
 //Default settings needed for BlueSpice
 $wgNamespacesWithSubpages[NS_MAIN] = true;
 $wgApiFrameOptions = 'SAMEORIGIN';
-$wgRSSUrlWhitelist = array( http://blog.blue-spice.org/feed/; );
+$wgRSSUrlWhitelist = array(
+   http://blog.blue-spice.org/feed/;,
+   http://blog.hallowelt.com/feed/;,
+);
 $wgExternalLinkTarget = '_blank';
 $wgCapitalLinkOverrides[ NS_FILE ] = false;
 $wgRestrictDisplayTitle = false; //Otherwise only titles that normalize to the 
same DB key are allowed

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc6f94d58c78b520f6ca32a392fa650029605499
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Pwirth wi...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] replaced js wg vars with mw.config.get due to deprecation - change (mediawiki...BlueSpiceFoundation)

2015-08-21 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/232910

Change subject: replaced js wg vars with mw.config.get due to deprecation
..

replaced js wg vars with mw.config.get due to deprecation

Change-Id: Iad52050358190a35660b311ae0afc70c760495e6
---
M resources/bluespice.extjs/BS/form/NamespaceCombo.js
M resources/bluespice.extjs/BS/store/LocalNamespaces.js
M resources/bluespice/bluespice.ping.js
3 files changed, 9 insertions(+), 8 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/10/232910/1

diff --git a/resources/bluespice.extjs/BS/form/NamespaceCombo.js 
b/resources/bluespice.extjs/BS/form/NamespaceCombo.js
index 92bd189..db7bdbc 100644
--- a/resources/bluespice.extjs/BS/form/NamespaceCombo.js
+++ b/resources/bluespice.extjs/BS/form/NamespaceCombo.js
@@ -27,7 +27,7 @@
//from text to id.
if( Ext.isString(value) ) {
var normText = value.toLowerCase().replace(' ', '_');
-   var id = wgNamespaceIds[normText];
+   var id = mw.config.get( wgNamespaceIds )[normText];
if( id ) {
value = id;
}
diff --git a/resources/bluespice.extjs/BS/store/LocalNamespaces.js 
b/resources/bluespice.extjs/BS/store/LocalNamespaces.js
index 062fb23..87b73ab 100644
--- a/resources/bluespice.extjs/BS/store/LocalNamespaces.js
+++ b/resources/bluespice.extjs/BS/store/LocalNamespaces.js
@@ -24,7 +24,8 @@
});
}
 
-   for ( var id in wgFormattedNamespaces ) {
+   var aFormattedNamespaces = mw.config.get( 
wgFormattedNamespaces );
+   for ( var id in aFormattedNamespaces ) {
if( this.excludeIds.indexOf( +id ) !== -1 ) {
continue;
}
@@ -33,7 +34,7 @@
if ( namespace.id === 0 ) {
namespace.namespace = mw.message( 
'blanknamespace' ).plain();
} else {
-   namespace.namespace = wgFormattedNamespaces[id];
+   namespace.namespace = mw.config.get( 
wgFormattedNamespaces )[id];
}
 
namespaces.push( namespace );
diff --git a/resources/bluespice/bluespice.ping.js 
b/resources/bluespice/bluespice.ping.js
index 7d1c679..fefa0bd 100644
--- a/resources/bluespice/bluespice.ping.js
+++ b/resources/bluespice/bluespice.ping.js
@@ -26,14 +26,14 @@
}
 
$.post(
-   wgScriptPath + '/index.php',
+   mw.config.get( wgScriptPath ) + '/index.php',
{
action:'ajax',
rs:'BsCore::ajaxBSPing',
-   iArticleID: wgArticleId,
-   sTitle: wgTitle,
-   iNamespace: wgNamespaceNumber,
-   iRevision: wgCurRevisionId,
+   iArticleID: mw.config.get( wgArticleId ),
+   sTitle: mw.config.get( wgTitle ),
+   iNamespace: mw.config.get( wgNamespaceNumber 
),
+   iRevision: mw.config.get( wgCurRevisionId ),
BsPingData: BsPingData
},
BSPing.pingCallback( aListenersToGo )

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad52050358190a35660b311ae0afc70c760495e6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] small improvements + settings fix - change (mediawiki...BlueSpiceExtensions)

2015-08-21 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/232901

Change subject: small improvements + settings fix
..

small improvements + settings fix

* categories can now be added in view mode even if the page is not created yet
* categoryselect window now stays open untill the request is finished
* failure messages will be displayed by now
* setting for adding parents re-implemented

Change-Id: I5c0d001d786d14a148d62655755844724864c071
---
M InsertCategory/InsertCategory.class.php
M InsertCategory/resources/BS.InsertCategory/Dialog.js
M InsertCategory/resources/bluespice.insertCategory.js
3 files changed, 68 insertions(+), 28 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/01/232901/1

diff --git a/InsertCategory/InsertCategory.class.php 
b/InsertCategory/InsertCategory.class.php
index 8c9a1c5..a5c11ef 100644
--- a/InsertCategory/InsertCategory.class.php
+++ b/InsertCategory/InsertCategory.class.php
@@ -104,7 +104,8 @@
 */
public static function onBeforePageDisplay( $out, $skin ) {
$out-addModuleStyles('ext.bluespice.insertcategory.styles');
-   $out-addModules('ext.bluespice.insertcategory');
+   $out-addModules( 'ext.bluespice.insertcategory' );
+   $out-addJsConfigVars( 'insertCategoryWithParents', 
BsConfig::get( 'MW::InsertCategory::WithParents' ) );
return true;
}
 
@@ -141,25 +142,34 @@
: explode( ',', $sTags );
 
$oTitle = Title::newFromID( $iArticleId );
-   if ( $oTitle-exists() ) {
-   $sCat = BsNamespaceHelper::getNamespaceName( 
NS_CATEGORY );
-   $sText = 
BsPageContentProvider::getInstance()-getContentFromTitle( $oTitle, 
Revision::RAW );
+   if ( is_null( $oTitle ) || !$oTitle-exists() ) {
+   $oRequest = RequestContext::getMain()-getRequest();
+   $iNamespaceId = $oRequest-getVal( page_ns, 0 );
+   $sPageName = $oRequest-getVal( page_name,  );
+   $oTitle = Title::newFromText( $sPageName, $iNamespaceId 
);
+   }
+   $sCat = BsNamespaceHelper::getNamespaceName( NS_CATEGORY );
+   $sText = 
BsPageContentProvider::getInstance()-getContentFromTitle( $oTitle, 
Revision::RAW );
 
-   // Remove all before adding
-   $sPattern = '#^\[\['.$sCat.':.*?\]\]#im';
-   $sText = preg_replace( $sPattern, '', $sText );
+   // Remove all before adding
+   $sPattern = '#^\[\[' . $sCat . ':.*?\]\]#im';
+   $sText = preg_replace( $sPattern, '', $sText );
 
-   if ( !empty( $aTags ) ) {
-   foreach ( $aTags as $sTag ) {
-   $sText .= \n[[.$sCat.:$sTag]];
-   }
+   if ( !empty( $aTags ) ) {
+   foreach ( $aTags as $sTag ) {
+   $sText .= \n[[ . $sCat . :$sTag]];
}
-
-   $oArticle = new Article( $oTitle );
-   $oArticle-doEdit( $sText, '', EDIT_UPDATE | EDIT_MINOR 
);
}
 
-   return FormatJson::encode( array( 'success' = true ) );
+   $oWikiPage = new WikiPage( $oTitle );
+   $oUser = RequestContext::getMain()-getUser();
+   $oContent = new WikitextContent( $sText );
+   $oStatus = $oWikiPage-doEditContent( $oContent, , 0, false, 
$oUser );
+   if ( !$oStatus-isGood() ) {
+   return FormatJson::encode( array ( 'success' = false, 
'msg' = $oStatus-getMessage() ) );
+   }
+
+   return FormatJson::encode( array ( 'success' = true ) );
}
 
/**
diff --git a/InsertCategory/resources/BS.InsertCategory/Dialog.js 
b/InsertCategory/resources/BS.InsertCategory/Dialog.js
index 7d2f86b..d2cf950 100644
--- a/InsertCategory/resources/BS.InsertCategory/Dialog.js
+++ b/InsertCategory/resources/BS.InsertCategory/Dialog.js
@@ -56,7 +56,19 @@
},
onItemClick: function( tree, record, item, index, e, eOpts ) {
this.isDirty = true;
-   this.bsCategories.addValue( [record.data.text] );
+   if ( mw.config.get( 'insertCategoryWithParents' ) ) {
+   this.addValuesFromRecord( record );
+   }
+   else {
+   this.bsCategories.addValue( [ record.data.text ] );
+   }
+   },
+   addValuesFromRecord: function ( record ) {
+   //parentNode is null if there is no parent, internalId src is 
the root of the categories
+   if ( typeof (

[MediaWiki-commits] [Gerrit] replaced js wg vars with mw.config.get due to deprecation - change (mediawiki...BlueSpiceExtensions)

2015-08-21 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/232909

Change subject: replaced js wg vars with mw.config.get due to deprecation
..

replaced js wg vars with mw.config.get due to deprecation

Change-Id: Ib2124295f19584dba366f8b0184790287106802c
---
M ArticleInfo/resources/bluespice.articleInfo.js
M ContextMenu/resources/bluespice.contextmenu.js
M Dashboards/resources/bluespice.dashboards.js
M ExtendedSearch/resources/bluespice.extendedSearch.admin.js
M ExtendedSearch/resources/bluespice.extendedSearch.focus.js
M ExtendedSearch/resources/bluespice.extendedSearch.specialpage.js
M InsertLink/resources/BS.InsertLink/FormPanelFileLink.js
M InsertLink/resources/BS.InsertLink/FormPanelWikiPage.js
M InsertLink/resources/BS.InsertLink/Window.js
M InsertMagic/resources/bluespice.insertMagic.js
M InterWikiLinks/resources/BS.InterWikiLinks/InsertLink/FormPanelInterWiki.js
M NamespaceManager/resources/BS.NamespaceManager/Panel.js
M PermissionManager/resources/bluespice.permissionManager.js
M 
ResponsibleEditors/resources/BS.ResponsibleEditors/ResponsibleEditorsPortlet.js
M ResponsibleEditors/resources/bluespice.responsibleEditors.BookshelfPlugin.js
M SaferEdit/resources/bluespice.SaferEdit.editmode.js
M ShoutBox/resources/bluespice.shoutBox.js
M StateBar/resources/bluespice.StateBar.js
M VisualEditor/resources/tiny_mce_plugins/bsactions/plugin.js
M VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
M WantedArticle/resources/bluespice.wantedArticle.js
21 files changed, 43 insertions(+), 37 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/09/232909/1

diff --git a/ArticleInfo/resources/bluespice.articleInfo.js 
b/ArticleInfo/resources/bluespice.articleInfo.js
index e042309..5b4f077 100644
--- a/ArticleInfo/resources/bluespice.articleInfo.js
+++ b/ArticleInfo/resources/bluespice.articleInfo.js
@@ -29,10 +29,12 @@
 
BsArticleInfo.checkRevisionInterval = 
bsArticleInfoCheckRevisionInterval*1000;
if( BsArticleInfo.checkRevisionInterval  1000 ) return;
-   if( wgCurRevisionId  1 ) return;
+   if ( mw.config.get( wgCurRevisionId )  1 ) {
+   return;
+   }
 
if( $('#bs-statebar').length  1 ) return;
-   BSPing.registerListener('ArticleInfo', 
BsArticleInfo.checkRevisionInterval, ['checkRevision', wgAction], 
BsArticleInfo.checkRevisionListener);
+   BSPing.registerListener( 'ArticleInfo', 
BsArticleInfo.checkRevisionInterval, [ 'checkRevision', mw.config.get( 
wgAction ) ], BsArticleInfo.checkRevisionListener );
},
 
updateLastEdited: function() {
@@ -44,7 +46,7 @@
checkRevisionListener: function( result, Listener) {
if( result.success !== true ) return;
if( result.newRevision !== true ) {
-   BSPing.registerListener('ArticleInfo', 
BsArticleInfo.checkRevisionInterval, ['checkRevision', wgAction], 
BsArticleInfo.checkRevisionListener);
+   BSPing.registerListener( 'ArticleInfo', 
BsArticleInfo.checkRevisionInterval, [ 'checkRevision', mw.config.get( 
wgAction ) ], BsArticleInfo.checkRevisionListener );
return;
}
 
diff --git a/ContextMenu/resources/bluespice.contextmenu.js 
b/ContextMenu/resources/bluespice.contextmenu.js
index e9d5f3d..9bde3a2 100644
--- a/ContextMenu/resources/bluespice.contextmenu.js
+++ b/ContextMenu/resources/bluespice.contextmenu.js
@@ -118,7 +118,7 @@
var titleParts = title.split('.');
var fileExtension = titleParts[titleParts.length-1];
 
-   if( wgFileExtensions.indexOf(fileExtension) === -1 ) {
+   if ( mw.config.get( wgFileExtensions ).indexOf( fileExtension 
) === -1 ) {
return true;
}
 
diff --git a/Dashboards/resources/bluespice.dashboards.js 
b/Dashboards/resources/bluespice.dashboards.js
index f21fdde..80aba65 100644
--- a/Dashboards/resources/bluespice.dashboards.js
+++ b/Dashboards/resources/bluespice.dashboards.js
@@ -20,7 +20,7 @@
}
 
if ( typeof bsPortalConfigLocation !== 'undefined' ) {
-   var image = 'img src='+ wgScriptPath + 
'/extensions/BlueSpiceFoundation/resources/bluespice/images/bs-m_add.png /';
+   var image = 'img src=' + mw.config.get( wgScriptPath ) + 
'/extensions/BlueSpiceFoundation/resources/bluespice/images/bs-m_add.png /';
var text = $( 'h1.firstHeading' ).html();
var anchor = $( 'h1.firstHeading' ).html( 
text + 'a href=# id=bs-dashboard-add' + image + 
'/a'
diff --git a/ExtendedSearch/resources/bluespice.extendedSearch.admin.js 
b/ExtendedSearch/resources/bluespice.extendedSearch.admin.js
index f29c8e0..bf14383 100644
---

[MediaWiki-commits] [Gerrit] removed atom icon from link in left nav - change (mediawiki...BlueSpiceSkin)

2015-08-20 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/232704

Change subject: removed atom icon from link in left nav
..

removed atom icon from link in left nav

Change-Id: I92d6c85083e049526c86c7c9405438e11cb6d590
---
M resources/components/skin.icons.less
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin 
refs/changes/04/232704/1

diff --git a/resources/components/skin.icons.less 
b/resources/components/skin.icons.less
index 01784b7..fafcc00 100644
--- a/resources/components/skin.icons.less
+++ b/resources/components/skin.icons.less
@@ -54,6 +54,9 @@
.bs-nav-item-text {
line-height: 22px; /* Has to be lower than icon height. 
Otherwise the text may break ugly */
}
+   #feed-atom{
+   background-image: none;
+   }
}
 
li#n-mainpage,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I92d6c85083e049526c86c7c9405438e11cb6d590
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] VisualEditor: Added support for various MS Word stylings - change (mediawiki...BlueSpiceExtensions)

2015-08-20 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/232706

Change subject: VisualEditor: Added support for various MS Word stylings
..

VisualEditor: Added support for various MS Word stylings

When Paste from word got removed from TinyMCE 4 a lot of formally
supported stylings from Word content got removed. See default
configuration in tinymce/plugins/paste/classes/WordFilter.js:114

I have readded most of them in the BSE/VisualEditor configuration.

Needs merge to REL1_23

Change-Id: Ifec95ff3114ee32a405ec8ff05f45e9339ca4b9e
---
M VisualEditor/VisualEditor.class.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/06/232706/1

diff --git a/VisualEditor/VisualEditor.class.php 
b/VisualEditor/VisualEditor.class.php
index 24547b8..241c5ca 100644
--- a/VisualEditor/VisualEditor.class.php
+++ b/VisualEditor/VisualEditor.class.php
@@ -53,6 +53,7 @@
 */
private $aConfigStandard = array(
'selector' = '#wpTextbox1',
+   'paste_word_valid_elements' = 
'b,strong,i,em,h1,h2,h3,h4,h5,table,thead,tfoot,tr,th,td,ol,ul,li,a,sub,sup,strike,br,del,div,p',
'plugins' = array(
lists,
//emoticons,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifec95ff3114ee32a405ec8ff05f45e9339ca4b9e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] VisualEditor: Added support for various MS Word stylings - change (mediawiki...BlueSpiceExtensions)

2015-08-20 Thread Tweichart (Code Review)

Tweichart has submitted this change and it was merged.

Change subject: VisualEditor: Added support for various MS Word stylings
..


VisualEditor: Added support for various MS Word stylings

When Paste from word got removed from TinyMCE 4 a lot of formally
supported stylings from Word content got removed. See default
configuration in tinymce/plugins/paste/classes/WordFilter.js:114

I have readded most of them in the BSE/VisualEditor configuration.

Needs merge to REL1_23

Change-Id: Ifec95ff3114ee32a405ec8ff05f45e9339ca4b9e
---
M VisualEditor/VisualEditor.class.php
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Tweichart: Verified; Looks good to me, approved



diff --git a/VisualEditor/VisualEditor.class.php 
b/VisualEditor/VisualEditor.class.php
index 24547b8..241c5ca 100644
--- a/VisualEditor/VisualEditor.class.php
+++ b/VisualEditor/VisualEditor.class.php
@@ -53,6 +53,7 @@
 */
private $aConfigStandard = array(
'selector' = '#wpTextbox1',
+   'paste_word_valid_elements' = 
'b,strong,i,em,h1,h2,h3,h4,h5,table,thead,tfoot,tr,th,td,ol,ul,li,a,sub,sup,strike,br,del,div,p',
'plugins' = array(
lists,
//emoticons,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifec95ff3114ee32a405ec8ff05f45e9339ca4b9e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] fix for minor overlapping bug - change (mediawiki...BlueSpiceSkin)

2015-08-20 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/232686

Change subject: fix for minor overlapping bug
..

fix for minor overlapping bug

(needs merge or transfer to REL1_23)

Change-Id: Ibdcf5d5f056cf3a95e4d77066b6b021032bbf257
---
M resources/components/skin.content.less
M resources/components/skin.menuTop.less
2 files changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin 
refs/changes/86/232686/1

diff --git a/resources/components/skin.content.less 
b/resources/components/skin.content.less
index 02ce8fd..7fb6d9a 100644
--- a/resources/components/skin.content.less
+++ b/resources/components/skin.content.less
@@ -54,5 +54,9 @@
}
}
}
+   #bs-usermanager-grid{
+   position: relative;
+   z-index: 100;
+   }
}
 }
\ No newline at end of file
diff --git a/resources/components/skin.menuTop.less 
b/resources/components/skin.menuTop.less
index 70b8a38..788ed1a 100644
--- a/resources/components/skin.menuTop.less
+++ b/resources/components/skin.menuTop.less
@@ -159,6 +159,8 @@
 }
 #bs-button-user #bs-personal-menu-container{
margin-top: 29px;
+   position: relative;
+   z-index: 1;
 }
 #bs-button-user #bs-personal-menu-container, #bs-cactions-button  div.menu{
background-color: transparent;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibdcf5d5f056cf3a95e4d77066b6b021032bbf257
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] changed event binding to properly work if submit button is c... - change (mediawiki...BlueSpiceExtensions)

2015-08-19 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/232449

Change subject: changed event binding to properly work if submit button is 
clicked
..

changed event binding to properly work if submit button is clicked

Change-Id: I617b154bfb1f1485f4d693ab4aa478ec0ef1c49f
---
M SaferEdit/resources/bluespice.SaferEdit.editmode.js
1 file changed, 11 insertions(+), 12 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/49/232449/1

diff --git a/SaferEdit/resources/bluespice.SaferEdit.editmode.js 
b/SaferEdit/resources/bluespice.SaferEdit.editmode.js
index b53dfbe..d9b21a3 100644
--- a/SaferEdit/resources/bluespice.SaferEdit.editmode.js
+++ b/SaferEdit/resources/bluespice.SaferEdit.editmode.js
@@ -190,20 +190,19 @@
 
 mw.loader.using( 'ext.bluespice', function() {
BsSaferEditEditMode.init();
-   if ( bsSaferEditWarnOnLeave  (typeof(alreadyBound) == 'undefined' || 
alreadyBound == false) ) {
-   $( window ).on( 'beforeunload', function ( e ) {
-   alreadyBound = true;
-   // if a string is returned, a dialog is displayed.
-   // if null is returned, nothing happenes and the page 
is left.
+   if ( bsSaferEditWarnOnLeave  ( typeof ( alreadyBound ) == 'undefined' 
|| alreadyBound == false ) ) {
+   window.onbeforeunload = function ( e ) {
+   var e = e || window.event;
var bReturn = BsSaferEditEditMode.checkSaved();
-   if ( bReturn !== null ) {
-   return bReturn;
+   if ( bReturn === null ) {
+   return;
}
-   // do not return anything, not even null. otherwise IE 
will display the dialogue
-   e.preventDefault();
-   e.stopImmediatePropagation();
-   });
-   $(document).on( 'submit', '#editform', function() {
+   if ( e ) {
+   e.returnValue = bReturn;
+   }
+   return bReturn;
+   };
+   $( document ).on( 'submit', '#editform', function () {
BsSaferEditEditMode.isSubmit = true;
} );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I617b154bfb1f1485f4d693ab4aa478ec0ef1c49f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] capitalize file name pt1 - change (mediawiki...BlueSpiceFoundation)

2015-07-24 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/226689

Change subject: capitalize file name pt1
..

capitalize file name pt1

Change-Id: If1f7e3ab5ffe0c827459e62dae0e7aa1550d4374
---
D includes/api/BsApiBase.php
1 file changed, 0 insertions(+), 50 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/89/226689/1

diff --git a/includes/api/BsApiBase.php b/includes/api/BsApiBase.php
deleted file mode 100644
index 3646340..000
--- a/includes/api/BsApiBase.php
+++ /dev/null
@@ -1,50 +0,0 @@
-?php
-
-abstract class BSApiBase extends ApiBase {
-   /**
-* Checks access permissions based on a list of titles and permissions. 
If
-* one of it fails the API processing is ended with an appropriate 
message
-* @param array $aTitles Array of Title objects to check the requires 
permissions against
-* @param User $oUser the User object of the requesting user. Does a 
fallback to $this-getUser();
-*/
-   protected function checkPermissions( $aTitles = array(), $oUser = null 
) {
-   $aRequiredPermissions = $this-getRequiredPermissions();
-   if( empty( $aRequiredPermissions ) ) {
-   return; //No need for further checking
-   }
-   foreach( $aTitles as $oTitle ) {
-   if( $oTitle instanceof Title === false ) {
-   continue;
-   }
-   foreach( $aRequiredPermissions as $sPermission ) {
-   if( $oTitle-userCan( $sPermission ) === false 
) {
-   //TODO: Reflect title and permission in 
error message
-   $this-dieUsageMsg( 'badaccess-groups' 
);
-   }
-   }
-   }
-
-   //Fallback if not conrete title was provided
-   if( empty( $aTitles ) ) {
-   if( $oUser instanceof User === false ) {
-   $oUser = $this-getUser();
-   }
-   foreach( $aRequiredPermissions as $sPermission ) {
-   if( $oUser-isAllowed( $sPermission ) === false 
) {
-   //TODO: Reflect permission in error 
message
-   $this-dieUsageMsg( 'badaccess-groups' 
);
-   }
-   }
-   }
-   }
-
-   protected function getRequiredPermissions() {
-   return array( 'read' );
-   }
-
-   protected function getExamples() {
-   return array(
-   'api.php?action='.$this-getModuleName(),
-   );
-   }
-}
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If1f7e3ab5ffe0c827459e62dae0e7aa1550d4374
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] capitalize file name pt2 - change (mediawiki...BlueSpiceFoundation)

2015-07-24 Thread Tweichart (Code Review)

Tweichart has submitted this change and it was merged.

Change subject: capitalize file name pt2
..


capitalize file name pt2

Change-Id: Iea98d6ca3c8993e03c5a7dfe0eaa751fad939ac1
---
A includes/api/BSApiBase.php
1 file changed, 50 insertions(+), 0 deletions(-)

Approvals:
  Tweichart: Verified; Looks good to me, approved



diff --git a/includes/api/BSApiBase.php b/includes/api/BSApiBase.php
new file mode 100644
index 000..3646340
--- /dev/null
+++ b/includes/api/BSApiBase.php
@@ -0,0 +1,50 @@
+?php
+
+abstract class BSApiBase extends ApiBase {
+   /**
+* Checks access permissions based on a list of titles and permissions. 
If
+* one of it fails the API processing is ended with an appropriate 
message
+* @param array $aTitles Array of Title objects to check the requires 
permissions against
+* @param User $oUser the User object of the requesting user. Does a 
fallback to $this-getUser();
+*/
+   protected function checkPermissions( $aTitles = array(), $oUser = null 
) {
+   $aRequiredPermissions = $this-getRequiredPermissions();
+   if( empty( $aRequiredPermissions ) ) {
+   return; //No need for further checking
+   }
+   foreach( $aTitles as $oTitle ) {
+   if( $oTitle instanceof Title === false ) {
+   continue;
+   }
+   foreach( $aRequiredPermissions as $sPermission ) {
+   if( $oTitle-userCan( $sPermission ) === false 
) {
+   //TODO: Reflect title and permission in 
error message
+   $this-dieUsageMsg( 'badaccess-groups' 
);
+   }
+   }
+   }
+
+   //Fallback if not conrete title was provided
+   if( empty( $aTitles ) ) {
+   if( $oUser instanceof User === false ) {
+   $oUser = $this-getUser();
+   }
+   foreach( $aRequiredPermissions as $sPermission ) {
+   if( $oUser-isAllowed( $sPermission ) === false 
) {
+   //TODO: Reflect permission in error 
message
+   $this-dieUsageMsg( 'badaccess-groups' 
);
+   }
+   }
+   }
+   }
+
+   protected function getRequiredPermissions() {
+   return array( 'read' );
+   }
+
+   protected function getExamples() {
+   return array(
+   'api.php?action='.$this-getModuleName(),
+   );
+   }
+}
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iea98d6ca3c8993e03c5a7dfe0eaa751fad939ac1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] capitalize file name pt2 - change (mediawiki...BlueSpiceFoundation)

2015-07-24 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/226690

Change subject: capitalize file name pt2
..

capitalize file name pt2

Change-Id: Iea98d6ca3c8993e03c5a7dfe0eaa751fad939ac1
---
A includes/api/BSApiBase.php
1 file changed, 50 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/90/226690/1

diff --git a/includes/api/BSApiBase.php b/includes/api/BSApiBase.php
new file mode 100644
index 000..3646340
--- /dev/null
+++ b/includes/api/BSApiBase.php
@@ -0,0 +1,50 @@
+?php
+
+abstract class BSApiBase extends ApiBase {
+   /**
+* Checks access permissions based on a list of titles and permissions. 
If
+* one of it fails the API processing is ended with an appropriate 
message
+* @param array $aTitles Array of Title objects to check the requires 
permissions against
+* @param User $oUser the User object of the requesting user. Does a 
fallback to $this-getUser();
+*/
+   protected function checkPermissions( $aTitles = array(), $oUser = null 
) {
+   $aRequiredPermissions = $this-getRequiredPermissions();
+   if( empty( $aRequiredPermissions ) ) {
+   return; //No need for further checking
+   }
+   foreach( $aTitles as $oTitle ) {
+   if( $oTitle instanceof Title === false ) {
+   continue;
+   }
+   foreach( $aRequiredPermissions as $sPermission ) {
+   if( $oTitle-userCan( $sPermission ) === false 
) {
+   //TODO: Reflect title and permission in 
error message
+   $this-dieUsageMsg( 'badaccess-groups' 
);
+   }
+   }
+   }
+
+   //Fallback if not conrete title was provided
+   if( empty( $aTitles ) ) {
+   if( $oUser instanceof User === false ) {
+   $oUser = $this-getUser();
+   }
+   foreach( $aRequiredPermissions as $sPermission ) {
+   if( $oUser-isAllowed( $sPermission ) === false 
) {
+   //TODO: Reflect permission in error 
message
+   $this-dieUsageMsg( 'badaccess-groups' 
);
+   }
+   }
+   }
+   }
+
+   protected function getRequiredPermissions() {
+   return array( 'read' );
+   }
+
+   protected function getExamples() {
+   return array(
+   'api.php?action='.$this-getModuleName(),
+   );
+   }
+}
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea98d6ca3c8993e03c5a7dfe0eaa751fad939ac1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] capitalize file name pt1 - change (mediawiki...BlueSpiceFoundation)

2015-07-24 Thread Tweichart (Code Review)

Tweichart has submitted this change and it was merged.

Change subject: capitalize file name pt1
..


capitalize file name pt1

Change-Id: If1f7e3ab5ffe0c827459e62dae0e7aa1550d4374
---
D includes/api/BsApiBase.php
1 file changed, 0 insertions(+), 50 deletions(-)

Approvals:
  Tweichart: Verified; Looks good to me, approved



diff --git a/includes/api/BsApiBase.php b/includes/api/BsApiBase.php
deleted file mode 100644
index 3646340..000
--- a/includes/api/BsApiBase.php
+++ /dev/null
@@ -1,50 +0,0 @@
-?php
-
-abstract class BSApiBase extends ApiBase {
-   /**
-* Checks access permissions based on a list of titles and permissions. 
If
-* one of it fails the API processing is ended with an appropriate 
message
-* @param array $aTitles Array of Title objects to check the requires 
permissions against
-* @param User $oUser the User object of the requesting user. Does a 
fallback to $this-getUser();
-*/
-   protected function checkPermissions( $aTitles = array(), $oUser = null 
) {
-   $aRequiredPermissions = $this-getRequiredPermissions();
-   if( empty( $aRequiredPermissions ) ) {
-   return; //No need for further checking
-   }
-   foreach( $aTitles as $oTitle ) {
-   if( $oTitle instanceof Title === false ) {
-   continue;
-   }
-   foreach( $aRequiredPermissions as $sPermission ) {
-   if( $oTitle-userCan( $sPermission ) === false 
) {
-   //TODO: Reflect title and permission in 
error message
-   $this-dieUsageMsg( 'badaccess-groups' 
);
-   }
-   }
-   }
-
-   //Fallback if not conrete title was provided
-   if( empty( $aTitles ) ) {
-   if( $oUser instanceof User === false ) {
-   $oUser = $this-getUser();
-   }
-   foreach( $aRequiredPermissions as $sPermission ) {
-   if( $oUser-isAllowed( $sPermission ) === false 
) {
-   //TODO: Reflect permission in error 
message
-   $this-dieUsageMsg( 'badaccess-groups' 
);
-   }
-   }
-   }
-   }
-
-   protected function getRequiredPermissions() {
-   return array( 'read' );
-   }
-
-   protected function getExamples() {
-   return array(
-   'api.php?action='.$this-getModuleName(),
-   );
-   }
-}
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If1f7e3ab5ffe0c827459e62dae0e7aa1550d4374
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pwirth wi...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] check for input, happens to be a full path already - change (mediawiki...BlueSpiceFoundation)

2015-07-23 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/226496

Change subject: check for input, happens to be a full path already
..

check for input, happens to be a full path already

Change-Id: I3583e6591a0cb117d54bdca757676f7230dd977d
---
M includes/utility/FileSystemHelper.class.php
1 file changed, 6 insertions(+), 5 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/96/226496/1

diff --git a/includes/utility/FileSystemHelper.class.php 
b/includes/utility/FileSystemHelper.class.php
index b2dc13b..5ae1f3b 100644
--- a/includes/utility/FileSystemHelper.class.php
+++ b/includes/utility/FileSystemHelper.class.php
@@ -58,20 +58,21 @@
}
}
 
-   if (empty($sSubDirName)) {
+   $sFullPath = strpos( $sSubDirName, BS_DATA_DIR ) === 0 ? 
$sSubDirName : BS_DATA_DIR . DS . $sSubDirName;
+   if ( empty( $sFullPath ) ) {
wfProfileOut(__METHOD__);
return Status::newGood(BS_DATA_DIR);
-   } elseif (is_dir(BS_DATA_DIR . DS . $sSubDirName)) {
+   } elseif ( is_dir( $sFullPath ) ) {
wfProfileOut(__METHOD__);
-   return Status::newGood(BS_DATA_DIR . DS . $sSubDirName);
+   return Status::newGood( $sFullPath );
}
-   if (!mkdir(BS_DATA_DIR . DS . $sSubDirName, 0777, true)) {
+   if ( !mkdir( $sFullPath, 0777, true ) ) {
wfProfileOut(__METHOD__);
return Status::newFatal(BS_DATA_DIR . ' is not 
accessible');
}
 
wfProfileOut(__METHOD__);
-   return Status::newGood(BS_DATA_DIR . DS . $sSubDirName);
+   return Status::newGood( $sFullPath );
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3583e6591a0cb117d54bdca757676f7230dd977d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] background image can now be reset to default - change (mediawiki...BlueSpiceExtensions)

2015-07-23 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/226494

Change subject: background image can now be reset to default
..

background image can now be reset to default

Change-Id: Ib49945af260def3046d8ad338a59e496234aa7ea
---
M Flexiskin/Flexiskin.class.php
M Flexiskin/includes/FlexiskinFormatter.class.php
M Flexiskin/resources/BS.Flexiskin/Menuitems/General.js
3 files changed, 13 insertions(+), 10 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/94/226494/1

diff --git a/Flexiskin/Flexiskin.class.php b/Flexiskin/Flexiskin.class.php
index 4f9ed91..7a2cbb3 100644
--- a/Flexiskin/Flexiskin.class.php
+++ b/Flexiskin/Flexiskin.class.php
@@ -90,16 +90,14 @@
/**
 * Replaces the BlueSpiceSkin screen.less file with the one specified 
by the parameters
 * @global string $wgResourceModules
-* @global string $wgStyleDirectory
-* @global string $wgUploadDirectory
 * @param string $sFlexiskinId
 * @param int $bIsTemp
 * @return boolean true of replaced correctly, otherwise false
 */
public function addCssFile( $sFlexiskinId, $bIsTemp = false ) {
-   global $wgResourceModules, $wgUploadPath, $wgUploadDirectory;
-   $oStatus = BsFileSystemHelper::ensureDataDirectory(flexiskin/ 
. $sFlexiskinId);
-   if ( $oStatus-isGood() ) {
+   global $wgResourceModules;
+   $oStatus = BsFileSystemHelper::ensureDataDirectory( 
flexiskin/ . $sFlexiskinId );
+   if ( !$oStatus-isGood() ) {
return false;
}
$sFilePath = BsFileSystemHelper::getDataPath(flexiskin/ . 
$sFlexiskinId);
diff --git a/Flexiskin/includes/FlexiskinFormatter.class.php 
b/Flexiskin/includes/FlexiskinFormatter.class.php
index 8847ba2..8c9d92d 100644
--- a/Flexiskin/includes/FlexiskinFormatter.class.php
+++ b/Flexiskin/includes/FlexiskinFormatter.class.php
@@ -10,11 +10,12 @@
else{
$aReturn[] = body{background-color:# . 
$aConfig-customBackgroundColor .  !important;};
}
-   if ( $aConfig-backgroundImage !=  ){
+   if ( isset( $aConfig-backgroundImage )  
$aConfig-backgroundImage !=  ) {
$aReturn[] = body{background-image:url('images/ . 
$aConfig-backgroundImage . ') !important;};
}
-   else{
-   $aReturn[] = body{background-image:none !important;};
+   else {
+   $sPath = 
RequestContext::getMain()-getSkin()-getSkinStylePath( 
resources/images/desktop/bg-lo.png );
+   $aReturn[] = body{background-image:url(' . $sPath . 
') !important;};
}
$aReturn[] = body{background-repeat: . 
$aConfig-repeatBackground .  !important;};
wfRunHooks( BSFlexiskinFormatterGeneral, array( $aConfig, 
$aReturn ) );
diff --git a/Flexiskin/resources/BS.Flexiskin/Menuitems/General.js 
b/Flexiskin/resources/BS.Flexiskin/Menuitems/General.js
index a620db3..acffaee 100644
--- a/Flexiskin/resources/BS.Flexiskin/Menuitems/General.js
+++ b/Flexiskin/resources/BS.Flexiskin/Menuitems/General.js
@@ -66,7 +66,8 @@
uploadFieldLabel: 
mw.message('bs-flexiskin-labelbackgroundupload').plain(),
uploadLabelWidth: 100,
uploadResetButton: true
-   });
+   } );
+   this.ufBackgroundUpload.on( 'reset', this.btnResetClick, this );
var rep_back_pos = Ext.create('Ext.data.Store', {
fields: ['repeating', 'val'],
data: [
@@ -181,7 +182,10 @@
this.tfDesc.setValue(data.config.desc);
this.setColor(this.pfBackgroundColor, 
data.config.backgroundColor);

this.tfCustomBackgroundColor.setValue(data.config.customBackgroundColor);
-   this.cgRepeatBackground.setValue(data.config.repeatBackground);
+   this.cgRepeatBackground.setValue( data.config.repeatBackground 
);
+   if ( typeof ( data.config.backgroundImage ) !== 'undefined'  
data.config.backgroundImage !==  ) {
+   this.ufBackgroundUpload.btnReset.enable();
+   }

Ext.getCmp('bs-extjs-uploadCombo-background-hidden-field').setValue(data.config.backgroundImage);
},
setColor: function(el, clr) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib49945af260def3046d8ad338a59e496234aa7ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

[MediaWiki-commits] [Gerrit] added missing dependency - change (mediawiki...BlueSpiceExtensions)

2015-07-23 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/226504

Change subject: added missing dependency
..

added missing dependency

Change-Id: I09c35c58f67c3b6dcaf98f1d0e4c9933854a4765
(cherry picked from commit a17b0f6a7bd2aece9c58b5b954d6ed8a52713df0)
---
M BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
M Preferences/Preferences.setup.php
M WidgetBar/WidgetBar.setup.php
3 files changed, 5 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/04/226504/1

diff --git 
a/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php 
b/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
index 7679b86..2151391 100644
--- a/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
+++ b/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
@@ -9,6 +9,7 @@
 $wgResourceModules['ext.bluespice.blueSpiceprojectfeedbackhelper'] = array(
'styles' = 
'extensions/BlueSpiceExtensions/BlueSpiceProjectFeedbackHelper/resources/bluespice.blueSpiceProjectFeedbackHelper.css',
'scripts' = 
'extensions/BlueSpiceExtensions/BlueSpiceProjectFeedbackHelper/resources/bluespice.blueSpiceProjectFeedbackHelper.js',
+   'dependencies' = array ( 'jquery.cookie' ),
'localBasePath' = $IP,
'remoteBasePath' = $GLOBALS['wgScriptPath']
 );
diff --git a/Preferences/Preferences.setup.php 
b/Preferences/Preferences.setup.php
index b7184fe..92348b0 100644
--- a/Preferences/Preferences.setup.php
+++ b/Preferences/Preferences.setup.php
@@ -16,7 +16,8 @@
 );
 
 $wgResourceModules['ext.bluespice.preferences'] = array(
-   'scripts' = 'bluespice.preferences.js'
-) + $aResourceModuleTemplate;
+   'scripts' = 'bluespice.preferences.js',
+   'dependencies' = array ( 'jquery.cookie' ),
+   ) + $aResourceModuleTemplate;
 
 unset( $aResourceModuleTemplate );
\ No newline at end of file
diff --git a/WidgetBar/WidgetBar.setup.php b/WidgetBar/WidgetBar.setup.php
index fd6edcb..929474e 100644
--- a/WidgetBar/WidgetBar.setup.php
+++ b/WidgetBar/WidgetBar.setup.php
@@ -19,6 +19,7 @@
 
 $wgResourceModules['ext.bluespice.widgetbar'] = array(
'scripts' = 'bluespice.widgetBar.js',
+   'dependencies' = array ( 'jquery.cookie' ),
'position' = 'bottom'
 ) + $aResourceModuleTemplate;
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I09c35c58f67c3b6dcaf98f1d0e4c9933854a4765
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] added missing dependency - change (mediawiki...BlueSpiceExtensions)

2015-07-23 Thread Tweichart (Code Review)

Tweichart has submitted this change and it was merged.

Change subject: added missing dependency
..


added missing dependency

Change-Id: I09c35c58f67c3b6dcaf98f1d0e4c9933854a4765
(cherry picked from commit a17b0f6a7bd2aece9c58b5b954d6ed8a52713df0)
---
M BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
M Preferences/Preferences.setup.php
M WidgetBar/WidgetBar.setup.php
3 files changed, 5 insertions(+), 2 deletions(-)

Approvals:
  Tweichart: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git 
a/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php 
b/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
index 7679b86..2151391 100644
--- a/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
+++ b/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
@@ -9,6 +9,7 @@
 $wgResourceModules['ext.bluespice.blueSpiceprojectfeedbackhelper'] = array(
'styles' = 
'extensions/BlueSpiceExtensions/BlueSpiceProjectFeedbackHelper/resources/bluespice.blueSpiceProjectFeedbackHelper.css',
'scripts' = 
'extensions/BlueSpiceExtensions/BlueSpiceProjectFeedbackHelper/resources/bluespice.blueSpiceProjectFeedbackHelper.js',
+   'dependencies' = array ( 'jquery.cookie' ),
'localBasePath' = $IP,
'remoteBasePath' = $GLOBALS['wgScriptPath']
 );
diff --git a/Preferences/Preferences.setup.php 
b/Preferences/Preferences.setup.php
index b7184fe..92348b0 100644
--- a/Preferences/Preferences.setup.php
+++ b/Preferences/Preferences.setup.php
@@ -16,7 +16,8 @@
 );
 
 $wgResourceModules['ext.bluespice.preferences'] = array(
-   'scripts' = 'bluespice.preferences.js'
-) + $aResourceModuleTemplate;
+   'scripts' = 'bluespice.preferences.js',
+   'dependencies' = array ( 'jquery.cookie' ),
+   ) + $aResourceModuleTemplate;
 
 unset( $aResourceModuleTemplate );
\ No newline at end of file
diff --git a/WidgetBar/WidgetBar.setup.php b/WidgetBar/WidgetBar.setup.php
index fd6edcb..929474e 100644
--- a/WidgetBar/WidgetBar.setup.php
+++ b/WidgetBar/WidgetBar.setup.php
@@ -19,6 +19,7 @@
 
 $wgResourceModules['ext.bluespice.widgetbar'] = array(
'scripts' = 'bluespice.widgetBar.js',
+   'dependencies' = array ( 'jquery.cookie' ),
'position' = 'bottom'
 ) + $aResourceModuleTemplate;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I09c35c58f67c3b6dcaf98f1d0e4c9933854a4765
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pwirth wi...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] small fix, now checks for unsaved changes in ajax ping - change (mediawiki...BlueSpiceExtensions)

2015-07-20 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/225859

Change subject: small fix, now checks for unsaved changes in ajax ping
..

small fix, now checks for unsaved changes in ajax ping

Change-Id: I61bfd0612fd4b94e847defe0f9c69b6f133b30fc
---
M SaferEdit/SaferEdit.class.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/59/225859/1

diff --git a/SaferEdit/SaferEdit.class.php b/SaferEdit/SaferEdit.class.php
index 1551832..6041943 100644
--- a/SaferEdit/SaferEdit.class.php
+++ b/SaferEdit/SaferEdit.class.php
@@ -379,7 +379,7 @@
$aSingleResult['success'] = true;
$aIntermediateEdits = 
$this-getIntermediateEditsForCurrentTitle( $oTitle );
$bHasUnsavedChanges = empty( 
$aData[0]['bUnsavedChanges'] ) || $aData[0]['bUnsavedChanges'] == false ? false 
: true;
-   if ( empty( $aIntermediateEdits ) ) {
+   if ( empty( $aIntermediateEdits ) || 
!$bHasUnsavedChanges ) {
return true;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I61bfd0612fd4b94e847defe0f9c69b6f133b30fc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] fix for right bs path - change (mediawiki...BlueSpiceExtensions)

2015-07-15 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/224785

Change subject: fix for right bs path
..

fix for right bs path

Change-Id: If0e7524bd6d3fddab8e41912c4e493767dbcbe93
---
M Flexiskin/Flexiskin.class.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/85/224785/1

diff --git a/Flexiskin/Flexiskin.class.php b/Flexiskin/Flexiskin.class.php
index 898fc01..9096dd5 100644
--- a/Flexiskin/Flexiskin.class.php
+++ b/Flexiskin/Flexiskin.class.php
@@ -85,7 +85,7 @@
if (self::getVal('flexiskin') || 
BsConfig::get('MW::Flexiskin::Active') != '') {
$sId = self::getVal('flexiskin') != '' ? 
self::getVal('flexiskin') : BsConfig::get('MW::Flexiskin::Active');
if ($sId != default)
-   $wgOut-addHeadItem('flexiskin', link 
rel='stylesheet' href=' . $wgUploadPath . /bluespice/flexiskin/ . $sId . 
/style . (self::getVal('preview', '') !=  ? '.tmp' : '') . .css');
+   $wgOut-addHeadItem( 'flexiskin', link 
rel='stylesheet' href=' . BsFileSystemHelper::getDataPath( 'flexiskin' ) . DS 
. $sId . /style . (self::getVal( 'preview', '' ) !=  ? '.tmp' : '') . 
.css' );
}
$this-mCore-registerPermission( 'flexiskinedit', array(), 
array( 'type' = 'global' ) );
wfProfileOut('BS::' . __METHOD__);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If0e7524bd6d3fddab8e41912c4e493767dbcbe93
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] maxheight for window, otherwise it's too big at some point - change (mediawiki...BlueSpiceExtensions)

2015-07-14 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/224574

Change subject: maxheight for window, otherwise it's too big at some point
..

maxheight for window, otherwise it's too big at some point

Change-Id: I09cf15ed1c008967f66d32a10954f6ab3fb08e73
---
M FormattingHelp/resources/bluespice.formattinghelp.js
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/74/224574/1

diff --git a/FormattingHelp/resources/bluespice.formattinghelp.js 
b/FormattingHelp/resources/bluespice.formattinghelp.js
index c20a3ca..f967717 100644
--- a/FormattingHelp/resources/bluespice.formattinghelp.js
+++ b/FormattingHelp/resources/bluespice.formattinghelp.js
@@ -16,7 +16,8 @@
$(document).on( 'click', 'a#bs-editbutton-formattinghelp', function(e){
e.preventDefault();

-   Ext.require( 'BS.FormattingHelp.Window', function() {
+   Ext.require( 'BS.FormattingHelp.Window', function () {
+   BS.FormattingHelp.Window.maxHeight = 
Ext.getBody().getViewSize().height;
BS.FormattingHelp.Window.show();
});


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I09cf15ed1c008967f66d32a10954f6ab3fb08e73
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_22
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] small changes for shoutbox mentions - change (mediawiki...BlueSpiceExtensions)

2015-07-14 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/224570

Change subject: small changes for shoutbox mentions
..

small changes for shoutbox mentions

* if a user mentions himself don't trigger the notification
* also there's no need to trigger the watched article notification on new sb 
entry if the user just mentions himself
* if others are mentioned too, the notification will be triggered as before

Change-Id: I9fa9933e6cf3f8ba7fb0e9ba9e47a2e1589d561d
---
M Notifications/Notifications.class.php
M ShoutBox/ShoutBox.class.php
2 files changed, 22 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/70/224570/1

diff --git a/Notifications/Notifications.class.php 
b/Notifications/Notifications.class.php
index fc13b3a..7afa9b4 100644
--- a/Notifications/Notifications.class.php
+++ b/Notifications/Notifications.class.php
@@ -376,8 +376,25 @@
public function onBSShoutBoxAfterInsertShout( $iArticleId, $iUserId, 
$sNick, $sMessage, $sTimestamp ) {
wfProfileIn( 'BS::'.__METHOD__ );
global $wgUser; // TODO SW: use user id
-   if ( $wgUser-isAllowed( 'bot' ) ) return true;
+   if ( $wgUser-isAllowed( 'bot' ) ) {
+   return true;
+   }
 
+   #check if users are mentioned in post
+   $oShoutbox = BsExtensionManager::getExtension( ShoutBox );
+   $aUsers = $oShoutbox::getUsersMentioned( $sMessage );
+   $bNotify = false;
+   #if there is any user in the post mentioned that is not the 
poster himself
+   #trigger the watched article notification
+   foreach ( $aUsers as $oUser ) {
+   if ( $oUser-getId() !== $iUserId ) {
+   $bNotify = true;
+   break;
+   }
+   }
+   if ( $bNotify === false ) {
+   return true;
+   }
EchoEvent::create( array(
'type' = 'bs-shoutbox',
'title' = Title::newFromID( $iArticleId ),
diff --git a/ShoutBox/ShoutBox.class.php b/ShoutBox/ShoutBox.class.php
index 60620ea..d3d29ee 100644
--- a/ShoutBox/ShoutBox.class.php
+++ b/ShoutBox/ShoutBox.class.php
@@ -541,6 +541,10 @@
if ( class_exists( 'EchoEvent' ) ) {
$oCurrentUser = RequestContext::getMain()-getUser();
foreach ( $aUsers as $oUser ) {
+   #if you're mentioning yourself don't send 
notification
+   if ( $oUser-getId() === $iUserId ) {
+   continue;
+   }
EchoEvent::create( array(
'type' = 'bs-shoutbox-' . $sAction,
'title' = Article::newFromID( 
$iArticleId )-getTitle(),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fa9933e6cf3f8ba7fb0e9ba9e47a2e1589d561d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] fix for wrong validation - change (mediawiki...BlueSpiceFoundation)

2015-07-09 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223729

Change subject: fix for wrong validation
..

fix for wrong validation

this field is checked by mw if there's a didgit in it or not. breaks 
Special:ComparePages if checked for is_numeric. should be sufficient this way

Change-Id: Ib8ca562a9e7e4e8045e6f29150ccc92d34fe2f84
---
M includes/html/htmlformfields/HTMLFormFieldOverrides.php
1 file changed, 0 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/29/223729/1

diff --git a/includes/html/htmlformfields/HTMLFormFieldOverrides.php 
b/includes/html/htmlformfields/HTMLFormFieldOverrides.php
index b1f6183..73b967b 100644
--- a/includes/html/htmlformfields/HTMLFormFieldOverrides.php
+++ b/includes/html/htmlformfields/HTMLFormFieldOverrides.php
@@ -72,9 +72,6 @@
$p = parent::validate( $value, $alldata );
 
if ( $p !== true ) return $p;
-   if ( !is_numeric( $value ) ) {
-   return $this-msg( 
'htmlform-int-invalid')-parseAsBlock();
-   }
 
if ( isset( $this-options['range_min'] )  $value  
$this-options['range_min'] ) {
return $this-msg( 
'htmlform-int-outofrange')-parseAsBlock();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8ca562a9e7e4e8045e6f29150ccc92d34fe2f84
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] fixed i18n message call - change (mediawiki...BlueSpiceExtensions)

2015-07-09 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223730

Change subject: fixed i18n message call
..

fixed i18n message call

Change-Id: I393cb2ea013396c1fb2802ef4e9ac91b09a34ac1
---
M Review/Review.class.php
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/30/223730/1

diff --git a/Review/Review.class.php b/Review/Review.class.php
index b94cd19..f066d0a 100644
--- a/Review/Review.class.php
+++ b/Review/Review.class.php
@@ -482,7 +482,7 @@
 */
public function logCreate($type, $action, $title = NULL, $skin = NULL, 
$params = array(), $filterWikilinks = false) {
$oUser = $this-getUser();
-   return wfMessage( 'bs-review-created-review', 
$oUser-getName(), Linker::link( $title, $title-getText() ) )-plain();
+   return wfMessage( 'bs-review-created-review', 
$oUser-getName(), Linker::link( $title, $title-getText() ) )-text();
}
 
// TODO RBV (30.06.11 13:07): Maybe a callback function would have done 
the trick, that chooses the return value according to $action?
@@ -498,7 +498,7 @@
 */
public function logModify($type, $action, $title = NULL, $skin = NULL, 
$params = array(), $filterWikilinks = false) {
$oUser = $this-getUser();
-   return wfMessage( 'bs-review-modified-review', 
$oUser-getName(), Linker::link( $title, $title-getText() ) )-plain();
+   return wfMessage( 'bs-review-modified-review', 
$oUser-getName(), Linker::link( $title, $title-getText() ) )-text();
}
 
/**
@@ -513,7 +513,7 @@
 */
public function logDelete($type, $action, $title = NULL, $skin = NULL, 
$params = array(), $filterWikilinks = false) {
$oUser = $this-getUser();
-   return wfMessage( 'bs-review-deleted-review', 
$oUser-getName(), Linker::link( $title, $title-getText() ) )-plain();
+   return wfMessage( 'bs-review-deleted-review', 
$oUser-getName(), Linker::link( $title, $title-getText() ) )-text();
}
 
/**
@@ -528,7 +528,7 @@
 */
public function logApprove($type, $action, $title = NULL, $skin = NULL, 
$params = array(), $filterWikilinks = false) {
$oUser = $this-getUser();
-   return wfMessage( 'bs-review-approved-review', 
$oUser-getName(), Linker::link( $title, $title-getText() ) )-plain();
+   return wfMessage( 'bs-review-approved-review', 
$oUser-getName(), Linker::link( $title, $title-getText() ) )-text();
}
 
/**
@@ -543,7 +543,7 @@
 */
public function logDeny($type, $action, $title = NULL, $skin = NULL, 
$params = array(), $filterWikilinks = false) {
$oUser = $this-getUser();
-   return wfMessage( 'bs-review-denied-review',$oUser-getName(), 
Linker::link( $title, $title-getText() ) )-plain();
+   return wfMessage( 'bs-review-denied-review', $oUser-getName(), 
Linker::link( $title, $title-getText() ) )-text();
}
 
/**
@@ -558,7 +558,7 @@
 */
public function logFinish($type, $action, $title = NULL, $skin = NULL, 
$params = array(), $filterWikilinks = false) {
$oUser = $this-getUser();
-   return wfMessage( 'bs-review-finished-review', 
$oUser-getName(), Linker::link( $title, $title-getText() ) )-plain();
+   return wfMessage( 'bs-review-finished-review', 
$oUser-getName(), Linker::link( $title, $title-getText() ) )-text();
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I393cb2ea013396c1fb2802ef4e9ac91b09a34ac1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] fix for special:review, now works again - change (mediawiki...BlueSpiceExtensions)

2015-07-09 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223734

Change subject: fix for special:review, now works again
..

fix for special:review, now works again

Change-Id: I1c519dfd9f36027c9f55660c20e022a28c014f58
---
M Review/Review.setup.php
M Review/resources/BS.Review/OverviewPanel.js
2 files changed, 5 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/34/223734/1

diff --git a/Review/Review.setup.php b/Review/Review.setup.php
index 113bcde..93f9f2c 100644
--- a/Review/Review.setup.php
+++ b/Review/Review.setup.php
@@ -36,7 +36,10 @@
 
 $wgResourceModules['ext.bluespice.review.overview'] = array(
'scripts' = 'bluespice.review.overview.js',
-   'dependencies' = 'ext.bluespice.review',
+   'dependencies' = array (
+   'ext.bluespice.review',
+   'mediawiki.Title'
+   ),
'messages' = array(
'bs-review-header-page-title',
'bs-review-header-owner-name',
diff --git a/Review/resources/BS.Review/OverviewPanel.js 
b/Review/resources/BS.Review/OverviewPanel.js
index da62de0..b34ad66 100644
--- a/Review/resources/BS.Review/OverviewPanel.js
+++ b/Review/resources/BS.Review/OverviewPanel.js
@@ -125,7 +125,7 @@
renderAssessors: function( value, metaData, record, rowIndex, colIndex, 
store ) {
var ownerName = mw.config.get('bsSpecialReviewUserName', false);
var table = 'table cellpadding=5';
-   var row = 'trtd{0}/tdtd{1}/tdtd{2}/td/tr';
+   var row = 'trtd{0}/tdtd{1} ({2})/td/tr';
var findActive = true;
var isSequential = record.get( 'rev_sequential' );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c519dfd9f36027c9f55660c20e022a28c014f58
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] fixed i18n message call - change (mediawiki...BlueSpiceExtensions)

2015-07-09 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223747

Change subject: fixed i18n message call
..

fixed i18n message call

Change-Id: I393cb2ea013396c1fb2802ef4e9ac91b09a34ac1
---
M Review/Review.class.php
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/47/223747/1

diff --git a/Review/Review.class.php b/Review/Review.class.php
index b94cd19..f066d0a 100644
--- a/Review/Review.class.php
+++ b/Review/Review.class.php
@@ -482,7 +482,7 @@
 */
public function logCreate($type, $action, $title = NULL, $skin = NULL, 
$params = array(), $filterWikilinks = false) {
$oUser = $this-getUser();
-   return wfMessage( 'bs-review-created-review', 
$oUser-getName(), Linker::link( $title, $title-getText() ) )-plain();
+   return wfMessage( 'bs-review-created-review', 
$oUser-getName(), Linker::link( $title, $title-getText() ) )-text();
}
 
// TODO RBV (30.06.11 13:07): Maybe a callback function would have done 
the trick, that chooses the return value according to $action?
@@ -498,7 +498,7 @@
 */
public function logModify($type, $action, $title = NULL, $skin = NULL, 
$params = array(), $filterWikilinks = false) {
$oUser = $this-getUser();
-   return wfMessage( 'bs-review-modified-review', 
$oUser-getName(), Linker::link( $title, $title-getText() ) )-plain();
+   return wfMessage( 'bs-review-modified-review', 
$oUser-getName(), Linker::link( $title, $title-getText() ) )-text();
}
 
/**
@@ -513,7 +513,7 @@
 */
public function logDelete($type, $action, $title = NULL, $skin = NULL, 
$params = array(), $filterWikilinks = false) {
$oUser = $this-getUser();
-   return wfMessage( 'bs-review-deleted-review', 
$oUser-getName(), Linker::link( $title, $title-getText() ) )-plain();
+   return wfMessage( 'bs-review-deleted-review', 
$oUser-getName(), Linker::link( $title, $title-getText() ) )-text();
}
 
/**
@@ -528,7 +528,7 @@
 */
public function logApprove($type, $action, $title = NULL, $skin = NULL, 
$params = array(), $filterWikilinks = false) {
$oUser = $this-getUser();
-   return wfMessage( 'bs-review-approved-review', 
$oUser-getName(), Linker::link( $title, $title-getText() ) )-plain();
+   return wfMessage( 'bs-review-approved-review', 
$oUser-getName(), Linker::link( $title, $title-getText() ) )-text();
}
 
/**
@@ -543,7 +543,7 @@
 */
public function logDeny($type, $action, $title = NULL, $skin = NULL, 
$params = array(), $filterWikilinks = false) {
$oUser = $this-getUser();
-   return wfMessage( 'bs-review-denied-review',$oUser-getName(), 
Linker::link( $title, $title-getText() ) )-plain();
+   return wfMessage( 'bs-review-denied-review', $oUser-getName(), 
Linker::link( $title, $title-getText() ) )-text();
}
 
/**
@@ -558,7 +558,7 @@
 */
public function logFinish($type, $action, $title = NULL, $skin = NULL, 
$params = array(), $filterWikilinks = false) {
$oUser = $this-getUser();
-   return wfMessage( 'bs-review-finished-review', 
$oUser-getName(), Linker::link( $title, $title-getText() ) )-plain();
+   return wfMessage( 'bs-review-finished-review', 
$oUser-getName(), Linker::link( $title, $title-getText() ) )-text();
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I393cb2ea013396c1fb2802ef4e9ac91b09a34ac1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] fix for special:review, now works again - change (mediawiki...BlueSpiceExtensions)

2015-07-09 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223743

Change subject: fix for special:review, now works again
..

fix for special:review, now works again

Change-Id: I1c519dfd9f36027c9f55660c20e022a28c014f58
(cherry picked from commit 9779a9b1c6a0a0fad795eee4a38a6642b3259ccb)
---
M Review/Review.setup.php
M Review/resources/BS.Review/OverviewPanel.js
2 files changed, 6 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/43/223743/1

diff --git a/Review/Review.setup.php b/Review/Review.setup.php
index 28667cb..fbedb5c 100644
--- a/Review/Review.setup.php
+++ b/Review/Review.setup.php
@@ -36,7 +36,10 @@
 
 $wgResourceModules['ext.bluespice.review.overview'] = array(
'scripts' = 'bluespice.review.overview.js',
-   'dependencies' = 'ext.bluespice.review',
+   'dependencies' = array (
+   'ext.bluespice.review',
+   'mediawiki.Title'
+   ),
'messages' = array(
'bs-review-header-page-title',
'bs-review-header-owner-name',
@@ -66,4 +69,4 @@
 $wgLogTypes[] = 'bs-review';
 $wgFilterLogTypes['bs-review'] = true;
 
-$wgHooks['LoadExtensionSchemaUpdates'][] = 'Review::getSchemaUpdates';
\ No newline at end of file
+$wgHooks['LoadExtensionSchemaUpdates'][] = 'Review::getSchemaUpdates';
diff --git a/Review/resources/BS.Review/OverviewPanel.js 
b/Review/resources/BS.Review/OverviewPanel.js
index da62de0..b34ad66 100644
--- a/Review/resources/BS.Review/OverviewPanel.js
+++ b/Review/resources/BS.Review/OverviewPanel.js
@@ -125,7 +125,7 @@
renderAssessors: function( value, metaData, record, rowIndex, colIndex, 
store ) {
var ownerName = mw.config.get('bsSpecialReviewUserName', false);
var table = 'table cellpadding=5';
-   var row = 'trtd{0}/tdtd{1}/tdtd{2}/td/tr';
+   var row = 'trtd{0}/tdtd{1} ({2})/td/tr';
var findActive = true;
var isSequential = record.get( 'rev_sequential' );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c519dfd9f36027c9f55660c20e022a28c014f58
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] fix for wrong validation - change (mediawiki...BlueSpiceFoundation)

2015-07-09 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223744

Change subject: fix for wrong validation
..

fix for wrong validation

this field is checked by mw if there's a didgit in it or not. breaks 
Special:ComparePages if checked for is_numeric. should be sufficient this way

Change-Id: Ib8ca562a9e7e4e8045e6f29150ccc92d34fe2f84
(cherry picked from commit ddedc9f3cd06180f63f8c40e24ea012acaeb4cb5)
---
M includes/html/htmlformfields/HTMLFormFieldOverrides.php
1 file changed, 0 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/44/223744/1

diff --git a/includes/html/htmlformfields/HTMLFormFieldOverrides.php 
b/includes/html/htmlformfields/HTMLFormFieldOverrides.php
index b1f6183..73b967b 100644
--- a/includes/html/htmlformfields/HTMLFormFieldOverrides.php
+++ b/includes/html/htmlformfields/HTMLFormFieldOverrides.php
@@ -72,9 +72,6 @@
$p = parent::validate( $value, $alldata );
 
if ( $p !== true ) return $p;
-   if ( !is_numeric( $value ) ) {
-   return $this-msg( 
'htmlform-int-invalid')-parseAsBlock();
-   }
 
if ( isset( $this-options['range_min'] )  $value  
$this-options['range_min'] ) {
return $this-msg( 
'htmlform-int-outofrange')-parseAsBlock();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8ca562a9e7e4e8045e6f29150ccc92d34fe2f84
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] reworked SaferEdit * now only brings up warning if unsaved c... - change (mediawiki...BlueSpiceExtensions)

2015-07-07 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223255

Change subject: reworked SaferEdit * now only brings up warning if unsaved 
changes are in the editor and the user wants to leave the page * still shows 
the statebar notice that someone is currently editing the page
..

reworked SaferEdit
* now only brings up warning if unsaved changes are in the editor and the user 
wants to leave the page
* still shows the statebar notice that someone is currently editing the page

Change-Id: I576210f1f1578b3bf257a61d3c0f1f151ad6e20a
---
M SaferEdit/SaferEdit.class.php
M SaferEdit/SaferEdit.setup.php
A SaferEdit/db/mysql/SaferEdit.patch.se_text.sql
M SaferEdit/db/mysql/SaferEdit.sql
M SaferEdit/db/oracle/SaferEdit.oci.sql
M SaferEdit/db/postgres/SaferEdit.pg.sql
M SaferEdit/resources/bluespice.SaferEdit.editmode.js
M SaferEdit/resources/bluespice.SaferEdit.general.js
8 files changed, 112 insertions(+), 534 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/55/223255/1

diff --git a/SaferEdit/SaferEdit.class.php b/SaferEdit/SaferEdit.class.php
index bf0bcd1..cdb18de 100644
--- a/SaferEdit/SaferEdit.class.php
+++ b/SaferEdit/SaferEdit.class.php
@@ -22,6 +22,7 @@
  * For further information visit http://www.blue-spice.org
  *
  * @author Markus Glaser gla...@hallowelt.biz
+ * @author Tobias Weichart weich...@hallowelt.biz
  * @version2.23.1
  * @packageBlueSpice_Extensions
  * @subpackage SaferEdit
@@ -50,7 +51,7 @@
$this-mInfo = array(
EXTINFO::NAME= 'SaferEdit',
EXTINFO::DESCRIPTION = 'bs-saferedit-desc',
-   EXTINFO::AUTHOR  = 'Markus Glaser',
+   EXTINFO::AUTHOR  = array ( 'Markus Glaser', 
'Tobias Weichart' ),
EXTINFO::VERSION = 'default',
EXTINFO::STATUS  = 'default',
EXTINFO::PACKAGE = 'default',
@@ -71,23 +72,17 @@
protected function initExt() {
wfProfileIn( 'BS::'.__METHOD__ );
 
-   BsConfig::registerVar( 'MW::SaferEdit::UseSE', true, 
BsConfig::LEVEL_USER|BsConfig::TYPE_BOOL|BsConfig::RENDER_AS_JAVASCRIPT, 
'bs-saferedit-pref-usese', 'toggle' );
-   //BsConfig::registerVar( 'MW::SaferEdit::HasTexts', false, 
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_BOOL|BsConfig::RENDER_AS_JAVASCRIPT, 
'bs-saferedit-pref-HasTexts', 'toggle' );
-   BsConfig::registerVar( 'MW::SaferEdit::EditSection', -1, 
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_INT|BsConfig::RENDER_AS_JAVASCRIPT, 
'bs-saferedit-pref-EditSection', 'int' );
BsConfig::registerVar( 'MW::SaferEdit::Interval', 10, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT|BsConfig::RENDER_AS_JAVASCRIPT, 
'bs-saferedit-pref-interval', 'int' );
BsConfig::registerVar( 'MW::SaferEdit::ShowNameOfEditingUser', 
true, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL|BsConfig::RENDER_AS_JAVASCRIPT, 
'bs-saferedit-pref-shownameofeditinguser', 'toggle' );
BsConfig::registerVar( 'MW::SaferEdit::WarnOnLeave', true, 
BsConfig::LEVEL_USER|BsConfig::TYPE_BOOL|BsConfig::RENDER_AS_JAVASCRIPT, 
'bs-saferedit-pref-warnonleave', 'toggle' );
 
$this-setHook( 'ArticleSaveComplete', 'clearSaferEdit' );
-   //$this-setHook( 'SkinTemplateOutputPageBeforeExec', 
'parseSaferEdit' );
$this-setHook( 'EditPage::showEditForm:initial', 
'setEditSection' );
$this-setHook( 'BSStateBarAddSortTopVars', 
'onStatebarAddSortTopVars' );
$this-setHook( 'BSStateBarBeforeTopViewAdd', 
'onStateBarBeforeTopViewAdd' );
$this-setHook( 'BeforeInitialize' );
$this-setHook( 'BeforePageDisplay' );
$this-setHook( 'BsAdapterAjaxPingResult' );
-
-   $this-mCore-registerBehaviorSwitch( 'NOSAFEREDIT', array( 
$this, 'noSaferEditCallback' ) ) ;
 
wfProfileOut( 'BS::'.__METHOD__ );
}
@@ -104,8 +99,6 @@
 
if ( BsExtensionManager::isContextActive( 
'MW::SaferEditEditMode' ) === false ) return true;
$oOutputPage-addModules('ext.bluespice.saferedit.editmode');
-
-   $this-parseSaferEdit( $oOutputPage-getTitle() );
return true;
}
 
@@ -139,17 +132,7 @@
$wgExtNewIndexes[] = array( 'bs_saferedit', 
'se_page_namespace', $sDir . 'SaferEdit.patch.se_page_namespace.index.oci.sql' 
);
*/
}
-   return true;
-   }
-
-   /**
-* Callback function for NOSAFEREDIT behavior switch
-* @return bool always true
-*/
-   public function noSaferEditCallback() {
-   BsExtensionManager::removeContext('MW::SaferEdit');
-

[MediaWiki-commits] [Gerrit] fixed notice, produced fatal - change (mediawiki...BlueSpiceExtensions)

2015-07-06 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/222995

Change subject: fixed notice, produced fatal
..

fixed notice, produced fatal

Change-Id: I33cba4c8a00e576c23dead72f6311c8e89e6b3b2
---
M Flexiskin/includes/FlexiskinApi.class.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/95/222995/1

diff --git a/Flexiskin/includes/FlexiskinApi.class.php 
b/Flexiskin/includes/FlexiskinApi.class.php
index 5ce90bc..a137a4b 100644
--- a/Flexiskin/includes/FlexiskinApi.class.php
+++ b/Flexiskin/includes/FlexiskinApi.class.php
@@ -32,6 +32,7 @@
if (!$oStatus-isGood()){
return array();
}
+   $aData = array ();
if ( $handle = opendir( $oStatus-getValue() ) ) {
while ( false !== ($entry = readdir( $handle )) ) {
if ( $entry != .  $entry != .. ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I33cba4c8a00e576c23dead72f6311c8e89e6b3b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] build: Configure banana-checker and jsonlint - change (mediawiki...BlueSpiceSkin)

2015-07-06 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/222996

Change subject: build: Configure banana-checker and jsonlint
..

build: Configure banana-checker and jsonlint

Change-Id: If98871314cb52679e5fd75d375fe0b8c156bcd86
(cherry picked from commit df4b4866e849071bc89cb380f0ebfe9864cf01ec)
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 33 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin 
refs/changes/96/222996/1

diff --git a/.gitignore b/.gitignore
index 75a89f4..9b344da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *~ 
 *.kate-swp 
 .*.swp
+node_modules/
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..9c56558
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..76e8a82
--- /dev/null
+++ b/package.json
@@ -0,0 +1,12 @@
+{
+  private: true,
+  scripts: {
+test: grunt test
+  },
+  devDependencies: {
+grunt: 0.4.5,
+grunt-cli: 0.1.13,
+grunt-banana-checker: 0.2.2,
+grunt-jsonlint: 1.0.4
+  }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If98871314cb52679e5fd75d375fe0b8c156bcd86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com

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

[MediaWiki-commits] [Gerrit] removed saferedit extension - change (mediawiki...BlueSpiceExtensions)

2015-07-06 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/222994

Change subject: removed saferedit extension
..

removed saferedit extension

Change-Id: Idc630d07b08d40cb9e41133f0f4ecaf981b176f3
---
M BlueSpiceExtensions.php.template
D SaferEdit/SaferEdit.class.php
D SaferEdit/SaferEdit.setup.php
D SaferEdit/db/mysql/SaferEdit.patch.se_page_namespace.index.sql
D SaferEdit/db/mysql/SaferEdit.patch.se_page_title.index.sql
D SaferEdit/db/mysql/SaferEdit.sql
D SaferEdit/db/oracle/SaferEdit.oci.sql
D SaferEdit/db/oracle/SaferEdit.patch.se_page_namespace.index.oci.sql
D SaferEdit/db/oracle/SaferEdit.patch.se_page_title.index.oci.sql
D SaferEdit/db/postgres/SaferEdit.patch.se_page_namespace.index.pg.sql
D SaferEdit/db/postgres/SaferEdit.patch.se_page_title.index.pg.sql
D SaferEdit/db/postgres/SaferEdit.pg.sql
D SaferEdit/i18n/br.json
D SaferEdit/i18n/de-formal.json
D SaferEdit/i18n/de.json
D SaferEdit/i18n/en.json
D SaferEdit/i18n/es.json
D SaferEdit/i18n/fa.json
D SaferEdit/i18n/fr.json
D SaferEdit/i18n/gl.json
D SaferEdit/i18n/he.json
D SaferEdit/i18n/it.json
D SaferEdit/i18n/ja.json
D SaferEdit/i18n/ksh.json
D SaferEdit/i18n/lb.json
D SaferEdit/i18n/mk.json
D SaferEdit/i18n/nl.json
D SaferEdit/i18n/pt.json
D SaferEdit/i18n/qqq.json
D SaferEdit/i18n/ru.json
D SaferEdit/i18n/sl.json
D SaferEdit/i18n/sv.json
D SaferEdit/i18n/uk.json
D SaferEdit/i18n/zh-hans.json
D SaferEdit/i18n/zh-hant.json
D SaferEdit/languages/SaferEdit.i18n.php
D SaferEdit/resources/bluespice.SaferEdit.editmode.js
D SaferEdit/resources/bluespice.SaferEdit.general.js
D SaferEdit/resources/images/bs-infobar-editing-orange.png
D SaferEdit/resources/images/bs-saferedit-error.png
D SaferEdit/resources/images/bs-saferedit.png
M StateBar/StateBar.class.php
42 files changed, 0 insertions(+), 1,736 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/94/222994/1

diff --git a/BlueSpiceExtensions.php.template b/BlueSpiceExtensions.php.template
index 9db77ba..84459fb 100644
--- a/BlueSpiceExtensions.php.template
+++ b/BlueSpiceExtensions.php.template
@@ -49,7 +49,6 @@
 require_once( __DIR__./PageTemplates/PageTemplates.setup.php );
 require_once( __DIR__./ResponsibleEditors/ResponsibleEditors.setup.php );
 require_once( __DIR__./Review/Review.setup.php );
-#require_once( __DIR__./SaferEdit/SaferEdit.setup.php );
 require_once( __DIR__./Statistics/Statistics.setup.php );
 require_once( __DIR__./Avatars/Avatars.setup.php );
 require_once( __DIR__./Readers/Readers.setup.php );
diff --git a/SaferEdit/SaferEdit.class.php b/SaferEdit/SaferEdit.class.php
deleted file mode 100644
index bf0bcd1..000
--- a/SaferEdit/SaferEdit.class.php
+++ /dev/null
@@ -1,571 +0,0 @@
-?php
-/**
- * SaferEdit extension for BlueSpice
- *
- * Intermediate saving of wiki edits.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * This file is part of BlueSpice for MediaWiki
- * For further information visit http://www.blue-spice.org
- *
- * @author Markus Glaser gla...@hallowelt.biz
- * @version2.23.1
- * @packageBlueSpice_Extensions
- * @subpackage SaferEdit
- * @copyright  Copyright (C) 2011 Hallo Welt! - Medienwerkstatt GmbH, All 
rights reserved.
- * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v2 or 
later
- * @filesource
- */
-
-/**
- * Base class for SaferEdit extension
- * @package BlueSpice_Extensions
- * @subpackage SaferEdit
- */
-class SaferEdit extends BsExtensionMW {
-
-   private $aIntermediateEditsForCurrentTitle = null;
-   /**
-* Constructor of SaferEdit class
-*/
-   public function __construct() {
-   wfProfileIn( 'BS::'.__METHOD__ );
-
-   // Base settings
-   $this-mExtensionFile = __FILE__;
-   $this-mExtensionType = EXTTYPE::VARIABLE;
-   $this-mInfo = array(
-   EXTINFO::NAME= 'SaferEdit',
-   EXTINFO::DESCRIPTION = 'bs-saferedit-desc',
-   EXTINFO::AUTHOR  = 'Markus Glaser',
-   EXTINFO::VERSION = 'default',
-   EXTINFO::STATUS  = 'default',
-   EXTINFO::PACKAGE =

[MediaWiki-commits] [Gerrit] added missing dependency - change (mediawiki...BlueSpiceSkin)

2015-07-06 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/222997

Change subject: added missing dependency
..

added missing dependency

Change-Id: I59f139c0b1de2007a3f5900999380060ba922b18
---
M BlueSpiceSkin.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin 
refs/changes/97/222997/1

diff --git a/BlueSpiceSkin.php b/BlueSpiceSkin.php
index 79f4642..e351032 100644
--- a/BlueSpiceSkin.php
+++ b/BlueSpiceSkin.php
@@ -61,6 +61,7 @@
'dependencies' = array(
'mediawiki.jqueryMsg',
'jquery.ui.tabs',
+   'jquery.cookie'
),
 ) + $aResourceModuleTemplate;
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I59f139c0b1de2007a3f5900999380060ba922b18
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] changed selector for better match, was overwritten in mw 1.24 - change (mediawiki...BlueSpiceExtensions)

2015-07-06 Thread Tweichart (Code Review)

Tweichart has submitted this change and it was merged.

Change subject: changed selector for better match, was overwritten in mw 1.24
..


changed selector for better match, was overwritten in mw 1.24

Change-Id: I3e68e0d1b353c1754849f2a1ee729dd8278944df
---
M ExtendedEditBar/resources/bluespice.extendedEditBar.css
1 file changed, 9 insertions(+), 9 deletions(-)

Approvals:
  Robert Vogel: Verified
  Tweichart: Looks good to me, approved



diff --git a/ExtendedEditBar/resources/bluespice.extendedEditBar.css 
b/ExtendedEditBar/resources/bluespice.extendedEditBar.css
index 724723d..9a311b0 100644
--- a/ExtendedEditBar/resources/bluespice.extendedEditBar.css
+++ b/ExtendedEditBar/resources/bluespice.extendedEditBar.css
@@ -31,47 +31,47 @@
border: 1px solid #cfcfcf
 }
 
-#mw-editbutton-bold {
+#bs-extendededitbar #mw-editbutton-bold {
/*@embed*/
background-image: url(images/button_format-bold.png);
 }
 
-#mw-editbutton-italic {
+#bs-extendededitbar #mw-editbutton-italic {
/*@embed*/
background-image: url(images/button_format-italic.png);
 }
 
-#mw-editbutton-headline {
+#bs-extendededitbar #mw-editbutton-headline {
/*@embed*/
background-image: url(images/button_format-h2.png);
 }
 
-#mw-editbutton-link {
+#bs-extendededitbar #mw-editbutton-link {
/*@embed*/
background-image: url(images/button_internal-link.png);
 }
 
-#mw-editbutton-extlink {
+#bs-extendededitbar #mw-editbutton-extlink {
/*@embed*/
background-image: url(images/button_external-link.png);
 }
 
-#mw-editbutton-strike {
+#bs-extendededitbar #mw-editbutton-strike {
/*@embed*/
background-image: url(images/button_format-struck.png);
 }
 
-#mw-editbutton-image {
+#bs-extendededitbar #mw-editbutton-image {
/*@embed*/
background-image: url(images/button_filelink.png);
 }
 
-#mw-editbutton-media {
+#bs-extendededitbar #mw-editbutton-media {
/*@embed*/
background-image: url(images/button_medialink.png);
 }
 
-#mw-editbutton-signature {
+#bs-extendededitbar #mw-editbutton-signature {
/*@embed*/
background-image: url(images/button_signatur.png);
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3e68e0d1b353c1754849f2a1ee729dd8278944df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pwirth wi...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] changed selector for better match, was overwritten in mw 1.24 - change (mediawiki...BlueSpiceExtensions)

2015-07-03 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/222546

Change subject: changed selector for better match, was overwritten in mw 1.24
..

changed selector for better match, was overwritten in mw 1.24

Change-Id: I3e68e0d1b353c1754849f2a1ee729dd8278944df
---
M ExtendedEditBar/resources/bluespice.extendedEditBar.css
1 file changed, 9 insertions(+), 9 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/46/222546/1

diff --git a/ExtendedEditBar/resources/bluespice.extendedEditBar.css 
b/ExtendedEditBar/resources/bluespice.extendedEditBar.css
index 724723d..9a311b0 100644
--- a/ExtendedEditBar/resources/bluespice.extendedEditBar.css
+++ b/ExtendedEditBar/resources/bluespice.extendedEditBar.css
@@ -31,47 +31,47 @@
border: 1px solid #cfcfcf
 }
 
-#mw-editbutton-bold {
+#bs-extendededitbar #mw-editbutton-bold {
/*@embed*/
background-image: url(images/button_format-bold.png);
 }
 
-#mw-editbutton-italic {
+#bs-extendededitbar #mw-editbutton-italic {
/*@embed*/
background-image: url(images/button_format-italic.png);
 }
 
-#mw-editbutton-headline {
+#bs-extendededitbar #mw-editbutton-headline {
/*@embed*/
background-image: url(images/button_format-h2.png);
 }
 
-#mw-editbutton-link {
+#bs-extendededitbar #mw-editbutton-link {
/*@embed*/
background-image: url(images/button_internal-link.png);
 }
 
-#mw-editbutton-extlink {
+#bs-extendededitbar #mw-editbutton-extlink {
/*@embed*/
background-image: url(images/button_external-link.png);
 }
 
-#mw-editbutton-strike {
+#bs-extendededitbar #mw-editbutton-strike {
/*@embed*/
background-image: url(images/button_format-struck.png);
 }
 
-#mw-editbutton-image {
+#bs-extendededitbar #mw-editbutton-image {
/*@embed*/
background-image: url(images/button_filelink.png);
 }
 
-#mw-editbutton-media {
+#bs-extendededitbar #mw-editbutton-media {
/*@embed*/
background-image: url(images/button_medialink.png);
 }
 
-#mw-editbutton-signature {
+#bs-extendededitbar #mw-editbutton-signature {
/*@embed*/
background-image: url(images/button_signatur.png);
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e68e0d1b353c1754849f2a1ee729dd8278944df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] added missing dependency - change (mediawiki...BlueSpiceSkin)

2015-07-03 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/222543

Change subject: added missing dependency
..

added missing dependency

Change-Id: Ied64e4bdcf2a00194a6864023e52baf830f4c9fe
---
M BlueSpiceSkin.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin 
refs/changes/43/222543/1

diff --git a/BlueSpiceSkin.php b/BlueSpiceSkin.php
index 02e38ec..b1a4ee4 100644
--- a/BlueSpiceSkin.php
+++ b/BlueSpiceSkin.php
@@ -65,6 +65,7 @@
'dependencies' = array(
'mediawiki.jqueryMsg',
'jquery.ui.tabs',
+   'jquery.cookie'
),
 ) + $aResourceModuleTemplate;
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied64e4bdcf2a00194a6864023e52baf830f4c9fe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] added missing dependency - change (mediawiki...BlueSpiceSkin)

2015-07-03 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/222545

Change subject: added missing dependency
..

added missing dependency

Change-Id: Ied64e4bdcf2a00194a6864023e52baf830f4c9fe
(cherry picked from commit 134964ca9b2f5d2388e440645508da19719147a4)
---
M BlueSpiceSkin.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin 
refs/changes/45/222545/1

diff --git a/BlueSpiceSkin.php b/BlueSpiceSkin.php
index 79f4642..e351032 100644
--- a/BlueSpiceSkin.php
+++ b/BlueSpiceSkin.php
@@ -61,6 +61,7 @@
'dependencies' = array(
'mediawiki.jqueryMsg',
'jquery.ui.tabs',
+   'jquery.cookie'
),
 ) + $aResourceModuleTemplate;
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied64e4bdcf2a00194a6864023e52baf830f4c9fe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] added missing dependency - change (mediawiki...BlueSpiceExtensions)

2015-07-03 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/222544

Change subject: added missing dependency
..

added missing dependency

Change-Id: I09c35c58f67c3b6dcaf98f1d0e4c9933854a4765
---
M BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
M Preferences/Preferences.setup.php
M WidgetBar/WidgetBar.setup.php
3 files changed, 5 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/44/222544/1

diff --git 
a/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php 
b/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
index 7679b86..2151391 100644
--- a/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
+++ b/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.setup.php
@@ -9,6 +9,7 @@
 $wgResourceModules['ext.bluespice.blueSpiceprojectfeedbackhelper'] = array(
'styles' = 
'extensions/BlueSpiceExtensions/BlueSpiceProjectFeedbackHelper/resources/bluespice.blueSpiceProjectFeedbackHelper.css',
'scripts' = 
'extensions/BlueSpiceExtensions/BlueSpiceProjectFeedbackHelper/resources/bluespice.blueSpiceProjectFeedbackHelper.js',
+   'dependencies' = array ( 'jquery.cookie' ),
'localBasePath' = $IP,
'remoteBasePath' = $GLOBALS['wgScriptPath']
 );
diff --git a/Preferences/Preferences.setup.php 
b/Preferences/Preferences.setup.php
index b7184fe..92348b0 100644
--- a/Preferences/Preferences.setup.php
+++ b/Preferences/Preferences.setup.php
@@ -16,7 +16,8 @@
 );
 
 $wgResourceModules['ext.bluespice.preferences'] = array(
-   'scripts' = 'bluespice.preferences.js'
-) + $aResourceModuleTemplate;
+   'scripts' = 'bluespice.preferences.js',
+   'dependencies' = array ( 'jquery.cookie' ),
+   ) + $aResourceModuleTemplate;
 
 unset( $aResourceModuleTemplate );
\ No newline at end of file
diff --git a/WidgetBar/WidgetBar.setup.php b/WidgetBar/WidgetBar.setup.php
index fd6edcb..929474e 100644
--- a/WidgetBar/WidgetBar.setup.php
+++ b/WidgetBar/WidgetBar.setup.php
@@ -19,6 +19,7 @@
 
 $wgResourceModules['ext.bluespice.widgetbar'] = array(
'scripts' = 'bluespice.widgetBar.js',
+   'dependencies' = array ( 'jquery.cookie' ),
'position' = 'bottom'
 ) + $aResourceModuleTemplate;
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I09c35c58f67c3b6dcaf98f1d0e4c9933854a4765
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] updated version number + release notes - change (mediawiki...BlueSpiceFoundation)

2015-06-30 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/221847

Change subject: updated version number + release notes
..

updated version number + release notes

Change-Id: I6913af7c2a931ebbd363a53453d5569989853ef2
(cherry picked from commit 125bfdfb3cf39cfa28b1098683c52e53deb184fe)
---
M BLUESPICE-RELEASE-NOTES
M BlueSpiceFoundation.php
M includes/installer/BsWebInstallerOutput.php
3 files changed, 16 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/47/221847/1

diff --git a/BLUESPICE-RELEASE-NOTES b/BLUESPICE-RELEASE-NOTES
index 9a5c22c..333a42b 100644
--- a/BLUESPICE-RELEASE-NOTES
+++ b/BLUESPICE-RELEASE-NOTES
@@ -3,6 +3,19 @@
 http://www.blue-spice.orgbr /
 http://www.hallowelt.combr /
 
+==BlueSpice 2.23.1.1==
+
+BlueSpice 2.23.1.1 is a security release.
+
+===Note===
+This release indends to fix a security vulnerability in the shoutbox extension.
+For details see https://gerrit.wikimedia.org/r/#/c/220410/
+
+===Changelog===
+
+BlueSpiceExtensions
+* Shoutbox: XSS Security fix
+
 ==BlueSpice 2.23.1==
 
 BlueSpice 2.23.1 is a minor and maintenance release.
@@ -134,6 +147,7 @@
 * Yuki Shira
 * TGC
 * Umherirrender
+* Frederic Mohr
 
 ===Standing on the shoulders of giants===
 We would like to thank all the people around MediaWiki. You've created a 
wonderful piece of software. Thanks a lot!
\ No newline at end of file
diff --git a/BlueSpiceFoundation.php b/BlueSpiceFoundation.php
index 68fe925..c24d5d9 100644
--- a/BlueSpiceFoundation.php
+++ b/BlueSpiceFoundation.php
@@ -29,7 +29,7 @@
  */
 $wgBlueSpiceExtInfo = array(
'name' = 'BlueSpice for MediaWiki',
-   'version' = '2.23.1',
+   'version' = '2.23.1.1',
'status' = 'stable',
'package' = 'BlueSpice Free', //default value for BS free extensions
'url' = 'http://www.blue-spice.org',
diff --git a/includes/installer/BsWebInstallerOutput.php 
b/includes/installer/BsWebInstallerOutput.php
index e97bb2c..6bc4f37 100644
--- a/includes/installer/BsWebInstallerOutput.php
+++ b/includes/installer/BsWebInstallerOutput.php
@@ -34,6 +34,6 @@
 // BlueSpice
public function outputTitle() {
global $wgVersion;
-   echo wfMessage( 'bs-installer-title', $wgVersion, '2.23.1' 
)-plain();
+   echo wfMessage( 'bs-installer-title', $wgVersion, '2.23.1.1' 
)-plain();
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6913af7c2a931ebbd363a53453d5569989853ef2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] updated version number + release notes - change (mediawiki...BlueSpiceFoundation)

2015-06-30 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/221844

Change subject: updated version number + release notes
..

updated version number + release notes

Change-Id: I6913af7c2a931ebbd363a53453d5569989853ef2
---
M BLUESPICE-RELEASE-HISTORY
M BLUESPICE-RELEASE-NOTES
M BlueSpiceFoundation.php
M includes/installer/BsWebInstallerOutput.php
4 files changed, 142 insertions(+), 75 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/44/221844/1

diff --git a/BLUESPICE-RELEASE-HISTORY b/BLUESPICE-RELEASE-HISTORY
index 26bb39c..3af2d56 100644
--- a/BLUESPICE-RELEASE-HISTORY
+++ b/BLUESPICE-RELEASE-HISTORY
@@ -5,6 +5,141 @@
 
 = BlueSpice release notes =
 
+==BlueSpice 2.23.1==
+
+BlueSpice 2.23.1 is a minor and maintenance release.
+
+===Note===
+This release includes the security fix commited on 24.06.2015.
+For details see https://gerrit.wikimedia.org/r/#/c/220410/
+
+===New features===
+* Database: added experimental SQLite compatibility
+* ExtensionInfo: Added link to Mediawiki version page
+* Shoutbox: mentions of users with @ now possible and with ajax autocomplete
+* SmartList: Added mode whatlinkshere
+
+===Changelog===
+BlueSpiceFoundation
+* Configuration: Allow all file types to be uploaded. This is fine in an 
intranet environment
+* Configuration: Added file protocol to DefaultSettings
+* Configuration: Changed RSS whitelist
+* Configuration: Removed a hardcoded path for the BlueSpice config files
+* Database: added experimental SQLite compatibility
+* General: Changed include order of BlueSpice
+* General: Added new global $bsgPermissionConfig for adding some configs to 
every permission
+* General: Added missing query param returnto to login link
+* MediaWiki compatibility: Update ApiResult handling for mediawiki/core change 
I7b37295e
+* MediaWiki compatibility: Remove long-deprecated ApiBase::getVersion()
+* BsFileSystemHelper: Allow upload of namespace prefixed files. Quickfix to 
support NSFileRepo
+* BsGroupHelper: Temporary user group now compatible with Lockdown extension
+* BsMailer: Mail footer message gets actually rendered now
+* GridFilter: An icon is shown when a filter is active on a grid column
+* NamespaceCombo: Removed defaultValue
+* ViewBaseElement: Fixed handling of DATA
+
+BlueSpiceExtensions
+* Avatars: Fixed warning if no user image was set
+* Blog: Added bs:blog:time tag
+* Blog: Prevent overlapping when thumbnails are used
+* Checklist: Fixed checkbox insert in IE
+* ExtensionInfo: Added link to MediaWiki version page
+* InsertCategory: Make it possible to remove categories in view mode
+* InsertFile: Fix for empty window after inserting a file
+* InsertImage: Fix when no links are present
+* InsertImage: Fixes in error handling
+* Notifications: Fixed bug with notifications badges in non-BlueSpice skins
+* PageTemplates: Added message parsing
+* PermissionManager: Notifications and warning fix
+* PermissionManager: Fixed errors on activation permission templates
+* PermissionManager: Fixed un-editable new groups
+* ResponsibleEditors: Fixed missing permissions in ajax context
+* ResponsibleEditors: Added string filters to WikiExplorer
+* Review: Improved notifications
+* Review: Set review counter to active if open review is present
+* Review: Separated from statebar
+* Review: Added hook AfterMakeJSDataObject
+* Review: Added hook handler to overwrite with FRCRevisionReview
+* Shoutbox: Mentions of users with @ now possible and with ajax autocomplete
+* Sidebar: Added link to MediaWiki Special:SpecialPages to admin tab
+* SmartList: Added mode 'whatlinkshere'
+* SmartList: 'whatlinkshere' now supports categories
+* StateBar: Fixed fatal when redirect article does not exist
+* Statistics: Fixed interval error message
+* Statistics: Fixed bug where multiple months didn't show the right statistics
+* UEModulePDF: Fixed bug when proxy is set
+* UniversalExport: Added PDF export link to toolbox
+* VisualEditor: Added code tag to list of tags special tags
+* VisualEditor: Mask templates in table style definitions
+* VisualEditor: Fixed table property dialog
+* VisualEditor: Make sure image caption is always at the end of image 
parameters
+* VisualEditor: Fixed umlaut handling in links without caption
+* VisualEditor: Prevent loading when not in edit mode
+
+BlueSpiceDistribution
+* LdapAuthentication: Added recent version with underscore fix
+* Connector: Created BSDistConnector to configure extensions
+* Removals: Cite, InputBox, Poem, SyntaxHighlight_GeSHi because those are part 
of MW standard release
+* Additions: NSFileRepo and TitleKey
+
+BlueSpiceSkin
+* Now using $wgResourceLoaderLESSVars for most LESS vars
+* Small fix for underlying elements of personal tools menu
+* Changed hard to read font color
+
+===Combatibility===
+* MediaWiki 1.22 - 1.24
+* PHP 5.3.2 or later.
+*

[MediaWiki-commits] [Gerrit] SECURITY: Fixed XSS vulnerability in Shoutbox - change (mediawiki...BlueSpiceExtensions)

2015-06-24 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/220413

Change subject: SECURITY: Fixed XSS vulnerability in Shoutbox
..

SECURITY: Fixed XSS vulnerability in Shoutbox

The ShoutBox extension in the BlueSpice Enterprise Wiki contained a stored
XSS flaw. Entered data was stored, retrieved and displayed unsanitized,
which allowed for injection of JavaScript.

Added encoding of all data input before storing it in the database.

Change-Id: I02b6e59ae57b83b194de33a270a78364adc22aa4
---
M ShoutBox/ShoutBox.class.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/13/220413/1

diff --git a/ShoutBox/ShoutBox.class.php b/ShoutBox/ShoutBox.class.php
index e5b4bae..cbdc6f2 100644
--- a/ShoutBox/ShoutBox.class.php
+++ b/ShoutBox/ShoutBox.class.php
@@ -336,6 +336,7 @@
if ( strlen( $sMessage )  BsConfig::get( 
'MW::ShoutBox::MaxMessageLength' ) ) {
$sMessage = substr( $sMessage, 0, BsConfig::get( 
'MW::ShoutBox::MaxMessageLength' ) );
}
+   $sMessage = htmlspecialchars( $sMessage, ENT_QUOTES, 'UTF-8' );
 
// TODO MRG (08.09.10 01:57): error message
if ( $iArticleId = 0 ) return false;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I02b6e59ae57b83b194de33a270a78364adc22aa4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_22
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] SECURITY: Fixed XSS vulnerability in Shoutbox - change (mediawiki...BlueSpiceExtensions)

2015-06-24 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/220412

Change subject: SECURITY: Fixed XSS vulnerability in Shoutbox
..

SECURITY: Fixed XSS vulnerability in Shoutbox

The ShoutBox extension in the BlueSpice Enterprise Wiki contained a stored
XSS flaw. Entered data was stored, retrieved and displayed unsanitized,
which allowed for injection of JavaScript.

Added encoding of all data input before storing it in the database.

Change-Id: I02b6e59ae57b83b194de33a270a78364adc22aa4
---
M ShoutBox/ShoutBox.class.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/12/220412/1

diff --git a/ShoutBox/ShoutBox.class.php b/ShoutBox/ShoutBox.class.php
index b3c5489..60620ea 100644
--- a/ShoutBox/ShoutBox.class.php
+++ b/ShoutBox/ShoutBox.class.php
@@ -392,6 +392,7 @@
if ( strlen( $sMessage )  BsConfig::get( 
'MW::ShoutBox::MaxMessageLength' ) ) {
$sMessage = substr( $sMessage, 0, BsConfig::get( 
'MW::ShoutBox::MaxMessageLength' ) );
}
+   $sMessage = htmlspecialchars( $sMessage, ENT_QUOTES, 'UTF-8' );
 
// TODO MRG (08.09.10 01:57): error message
if ( $iArticleId = 0 )

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I02b6e59ae57b83b194de33a270a78364adc22aa4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] fix for jumping to the top of the page on click - change (mediawiki...BlueSpiceSkin)

2015-06-22 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/219785

Change subject: fix for jumping to the top of the page on click
..

fix for jumping to the top of the page on click

Change-Id: I1817a9e9e6d48bd99b5c1524e4007afadf7bf920
---
M resources/components/extension.widgetbar.js
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin 
refs/changes/85/219785/1

diff --git a/resources/components/extension.widgetbar.js 
b/resources/components/extension.widgetbar.js
index db5284c..767b924 100644
--- a/resources/components/extension.widgetbar.js
+++ b/resources/components/extension.widgetbar.js
@@ -1,6 +1,7 @@
 $(document).ready(function() {
var widgetBarToggler = $('#bs-cactions-button  a');
-   widgetBarToggler.click(function(e){
+   widgetBarToggler.click( function ( e ) {
+   e.preventDefault();
$(this).toggleClass(open);
if ($('#bs-flyout').length !== 0)
$(#bs-flyout).fadeToggle(200);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1817a9e9e6d48bd99b5c1524e4007afadf7bf920
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] fix for jumping to the top of the page on click - change (mediawiki...BlueSpiceExtensions)

2015-06-22 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/219784

Change subject: fix for jumping to the top of the page on click
..

fix for jumping to the top of the page on click

Change-Id: Icece758ce75cc86eb825c35f705eadf20c901f20
---
M StateBar/resources/bluespice.StateBar.js
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/84/219784/1

diff --git a/StateBar/resources/bluespice.StateBar.js 
b/StateBar/resources/bluespice.StateBar.js
index 7a0273e..e37b80d 100644
--- a/StateBar/resources/bluespice.StateBar.js
+++ b/StateBar/resources/bluespice.StateBar.js
@@ -84,7 +84,8 @@
},
 
viewTogglerClick: function( inputObject ) {
-   inputObject.click(function(){
+   inputObject.click( function ( e ) {
+   e.preventDefault();
BsStateBar.oStateBarView.slideToggle( 'fast' );
$('#bs-statebar-viewtoggler').toggleClass('open');
BsStateBar.getStateBarBody();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icece758ce75cc86eb825c35f705eadf20c901f20
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] fix for jumping to the top of the page on click - change (mediawiki...BlueSpiceSkin)

2015-06-19 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/219345

Change subject: fix for jumping to the top of the page on click
..

fix for jumping to the top of the page on click

Change-Id: I1817a9e9e6d48bd99b5c1524e4007afadf7bf920
---
M resources/components/extension.widgetbar.js
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin 
refs/changes/45/219345/1

diff --git a/resources/components/extension.widgetbar.js 
b/resources/components/extension.widgetbar.js
index db5284c..767b924 100644
--- a/resources/components/extension.widgetbar.js
+++ b/resources/components/extension.widgetbar.js
@@ -1,6 +1,7 @@
 $(document).ready(function() {
var widgetBarToggler = $('#bs-cactions-button  a');
-   widgetBarToggler.click(function(e){
+   widgetBarToggler.click( function ( e ) {
+   e.preventDefault();
$(this).toggleClass(open);
if ($('#bs-flyout').length !== 0)
$(#bs-flyout).fadeToggle(200);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1817a9e9e6d48bd99b5c1524e4007afadf7bf920
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] fix for jumping to the top of the page on click - change (mediawiki...BlueSpiceExtensions)

2015-06-19 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/219344

Change subject: fix for jumping to the top of the page on click
..

fix for jumping to the top of the page on click

Change-Id: Icece758ce75cc86eb825c35f705eadf20c901f20
---
M StateBar/resources/bluespice.StateBar.js
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/44/219344/1

diff --git a/StateBar/resources/bluespice.StateBar.js 
b/StateBar/resources/bluespice.StateBar.js
index 7a0273e..e37b80d 100644
--- a/StateBar/resources/bluespice.StateBar.js
+++ b/StateBar/resources/bluespice.StateBar.js
@@ -84,7 +84,8 @@
},
 
viewTogglerClick: function( inputObject ) {
-   inputObject.click(function(){
+   inputObject.click( function ( e ) {
+   e.preventDefault();
BsStateBar.oStateBarView.slideToggle( 'fast' );
$('#bs-statebar-viewtoggler').toggleClass('open');
BsStateBar.getStateBarBody();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icece758ce75cc86eb825c35f705eadf20c901f20
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] fix for umlaut problem - change (mediawiki...BlueSpiceExtensions)

2015-06-12 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/217795

Change subject: fix for umlaut problem
..

fix for umlaut problem

* values with umlaute were broken

Change-Id: I29703d0c3a345797bc62a826c0cb21aa898ab189
---
M ExtendedSearch/views/view.SearchMultivalueField.php
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/95/217795/1

diff --git a/ExtendedSearch/views/view.SearchMultivalueField.php 
b/ExtendedSearch/views/view.SearchMultivalueField.php
index 8648f90..fc99a82 100644
--- a/ExtendedSearch/views/view.SearchMultivalueField.php
+++ b/ExtendedSearch/views/view.SearchMultivalueField.php
@@ -68,9 +68,11 @@
$sEntries = '';
foreach ( $this-entries as $datasetArray ) {
$bSelected = false;
-   if ( isset( $datasetArray['selected'] )  
$datasetArray['selected'] === true ) $bSelected = true;
+   if ( isset( $datasetArray['selected'] )  
$datasetArray['selected'] === true ) {
+   $bSelected = true;
+   }
$sEntries .= Xml::option( 
-   htmlentities( $datasetArray['text'], 
ENT_QUOTES, 'UTF-8' ),
+   htmlspecialchars( $datasetArray['text'], 
ENT_QUOTES, 'UTF-8' ),
$datasetArray['value'],
$bSelected
);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I29703d0c3a345797bc62a826c0cb21aa898ab189
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] fix for flexiskin display - change (mediawiki...BlueSpiceSkin)

2015-06-09 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/216927

Change subject: fix for flexiskin display
..

fix for flexiskin display

Change-Id: I3acb4f393b7acdf0d330cebc4e283f2f003cfd9f
---
M resources/components/extension.widgetbar.less
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin 
refs/changes/27/216927/1

diff --git a/resources/components/extension.widgetbar.less 
b/resources/components/extension.widgetbar.less
index 2f8d8af..be9d80c 100644
--- a/resources/components/extension.widgetbar.less
+++ b/resources/components/extension.widgetbar.less
@@ -28,6 +28,7 @@
#bs-flyout-content{
display: table;
margin-top: -4px;
+   width: 100%;
 div{
vertical-align: top;
}
@@ -68,7 +69,7 @@
}
#bs-flyout-content-widgets{
display: table;
-   width: 721px;
+   width: 100%;
h4{
display: table-caption;
#bs-widgetbar-edit{
@@ -91,7 +92,7 @@
}
#bs-flyout-content-more{
display: table-cell;
-   width: 199px;
+   width: 25%;
border-left: 1px solid @bs-color-light-grey;
h4{
display: block;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3acb4f393b7acdf0d330cebc4e283f2f003cfd9f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] Resources.php: Removed unnecessary dependencies added 'mob... - change (mediawiki...BlueSpiceFoundation)

2015-06-09 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/216913

Change subject: Resources.php: Removed unnecessary dependencies  added 
'mobile' as target
..

Resources.php: Removed unnecessary dependencies  added 'mobile' as target

Those dependencies are - as far as I can tell - not necessary anymore. With
'mobile' as target the JavaScripts are also available in MobileFrontend.

Needs merge to REL1_23

Change-Id: Ia39622f5f3e60d32aed7c7c40d8483b2aa26f82c
(cherry picked from commit 3cdc53663c996faaa0018d5c955eeb4ddefe56ec)
---
M resources/Resources.php
1 file changed, 1 insertion(+), 9 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/13/216913/1

diff --git a/resources/Resources.php b/resources/Resources.php
index 74be6b7..b91c3e9 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -8,6 +8,7 @@
'localBasePath' = $IP . '/extensions/BlueSpiceFoundation/resources',
'remoteExtPath' = 'BlueSpiceFoundation/resources',
'group' = 'ext.bluespice',
+   'targets' = array( 'mobile', 'desktop' )
 );
 
 $wgResourceModules['ext.bluespice'] = array(
@@ -20,15 +21,6 @@
'bluespice/bluespice.string.js',
'bluespice/bluespice.xhr.js',
'bluespice/bluespice.ping.js'
-   ),
-   'dependencies' = array(
-   'jquery.ui.core',
-   'jquery.ui.dialog',
-   'jquery.ui.tabs',
-   'jquery.cookie',
-   'jquery.ui.sortable',
-   'jquery.ui.autocomplete',
-   'jquery.effects.core'
),
'messages' = array(
'largefileserver',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia39622f5f3e60d32aed7c7c40d8483b2aa26f82c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] fix for NaN display - change (mediawiki...MobileFrontend)

2015-06-09 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/216916

Change subject: fix for NaN display
..

fix for NaN display

*if one file was uploaded the counter showed NaN

Change-Id: I3935022f120aec6c5da3656fe4d07d64d8cfc626
---
M resources/mobile.notifications/init.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/16/216916/1

diff --git a/resources/mobile.notifications/init.js 
b/resources/mobile.notifications/init.js
index 4cfbdef..b40c731 100644
--- a/resources/mobile.notifications/init.js
+++ b/resources/mobile.notifications/init.js
@@ -62,7 +62,7 @@
result.resolve(
new NotificationsOverlay( {
$badge: $btn,
-   count: parseInt( $btn.find( 
'span' ).text(), 10 )
+   count: parseInt( $btn.find( 
'span' ).text(), 10 ) || 1
} )
);
} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3935022f120aec6c5da3656fe4d07d64d8cfc626
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] bugfix for deleting unsaved templates - change (mediawiki...BlueSpiceExtensions)

2015-05-08 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/209717

Change subject: bugfix for deleting unsaved templates
..

bugfix for deleting unsaved templates

* needs cherry-pick to at least REL1_23

Change-Id: I41877891a04b7fa4ff5dc1c2924cb6c77247828e
---
M PermissionManager/resources/BS.PermissionManager/TemplateEditor.js
1 file changed, 9 insertions(+), 5 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/17/209717/1

diff --git a/PermissionManager/resources/BS.PermissionManager/TemplateEditor.js 
b/PermissionManager/resources/BS.PermissionManager/TemplateEditor.js
index 99e9803..ab77c04 100644
--- a/PermissionManager/resources/BS.PermissionManager/TemplateEditor.js
+++ b/PermissionManager/resources/BS.PermissionManager/TemplateEditor.js
@@ -142,9 +142,9 @@
rootVisible: false,
margins: '0 0 5 0',
listeners: {
-   'select': function(rm, record) {
-   var data = [];
-   for (var i in 
me._permissionStore.data.items) {
+   'select': function ( rm, record ) {
+   var data = [ ];
+   for ( var i in 
me._permissionStore.data.items ) {
var dataSet = 
me._permissionStore.data.items[i].data;
dataSet.enabled = 
Ext.Array.contains(record.get('ruleSet'), dataSet.name);
data.push(dataSet);
@@ -247,8 +247,12 @@
handler: function() {
var record = 
Ext.getCmp('bs-template-editor-treepanel')

.getSelectionModel().getLastSelected(),
-   id = record.get('id');
-
+   id = record.get( 'id' );
+   //id == 0 if the template hasn't been 
saved yet
+   if ( id === 0 ) {
+   record.remove( );
+   return true;
+   }
Ext.Ajax.request({
url: 
bs.util.getAjaxDispatcherUrl('PermissionManager::deleteTemplate'),
method: 'POST',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I41877891a04b7fa4ff5dc1c2924cb6c77247828e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] Fixed LESS variable - change (mediawiki...BlueSpiceSkin)

2015-04-28 Thread Tweichart (Code Review)

Tweichart has submitted this change and it was merged.

Change subject: Fixed LESS variable
..


Fixed LESS variable

There was an aplha channel referenced where it should not have been. This
caused LESS to crash awfully.

Change-Id: Id5e901712dc6f468f7248f9119dc3787a899f73c
---
M BlueSpiceSkin.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/BlueSpiceSkin.php b/BlueSpiceSkin.php
index 9d71af4..79f4642 100644
--- a/BlueSpiceSkin.php
+++ b/BlueSpiceSkin.php
@@ -101,7 +101,7 @@
'bs-color-dark-blue' = 'rgb(62, 83, 137)',
'bs-color-bright-blue-a' = 'rgba(205, 223, 242, 0.6)',
'bs-color-middle-blue-a' = 'rgba(62, 83, 137, 0.44)',
-   'bs-color-middle-blue' = 'rgba(152, 167, 196)',
+   'bs-color-middle-blue' = 'rgb(152, 167, 196)',
'bs-color-light-grey' = 'rgb(211, 211, 211)',
'bs-color-dark-grey' = 'rgb(186, 186, 186)',
'bs-color-darker-grey' = '#494949',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id5e901712dc6f468f7248f9119dc3787a899f73c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pwirth wi...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Fixed LESS variable - change (mediawiki...BlueSpiceSkin)

2015-04-28 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/207033

Change subject: Fixed LESS variable
..

Fixed LESS variable

There was an aplha channel referenced where it should not have been. This
caused LESS to crash awfully.

Change-Id: Id5e901712dc6f468f7248f9119dc3787a899f73c
(cherry picked from commit 712fb7887464b4ed2beea9955f7c935bc5f08e93)
---
M BlueSpiceSkin.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin 
refs/changes/33/207033/1

diff --git a/BlueSpiceSkin.php b/BlueSpiceSkin.php
index 9d71af4..79f4642 100644
--- a/BlueSpiceSkin.php
+++ b/BlueSpiceSkin.php
@@ -101,7 +101,7 @@
'bs-color-dark-blue' = 'rgb(62, 83, 137)',
'bs-color-bright-blue-a' = 'rgba(205, 223, 242, 0.6)',
'bs-color-middle-blue-a' = 'rgba(62, 83, 137, 0.44)',
-   'bs-color-middle-blue' = 'rgba(152, 167, 196)',
+   'bs-color-middle-blue' = 'rgb(152, 167, 196)',
'bs-color-light-grey' = 'rgb(211, 211, 211)',
'bs-color-dark-grey' = 'rgb(186, 186, 186)',
'bs-color-darker-grey' = '#494949',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5e901712dc6f468f7248f9119dc3787a899f73c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] fix for required options on api call - change (mediawiki...BlueSpiceFoundation)

2015-04-24 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/206358

Change subject: fix for required options on api call
..

fix for required options on api call

Change-Id: I16bc1921d79cc92d0e1d4716d156fa5a8658b909
---
M includes/CoreHooks.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/58/206358/1

diff --git a/includes/CoreHooks.php b/includes/CoreHooks.php
index 01df79f..f82db79 100644
--- a/includes/CoreHooks.php
+++ b/includes/CoreHooks.php
@@ -279,7 +279,8 @@
public static function onApiCheckCanExecute( $module, $user, $message 
){
if (!$module instanceof ApiParse)
return true;
-   if 
(Title::newFromText($module-getRequest()-getVal('page'))-userCan('read') == 
false){
+   $oTitle = Title::newFromText( $module-getRequest()-getVal( 
'page' ) );
+   if ( !is_null( $oTitle )  $oTitle-userCan( 'read' ) == false 
) {
$message = wfMessage('loginreqpagetext', 
wfMessage('loginreqlink')-plain())-plain();
return false;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I16bc1921d79cc92d0e1d4716d156fa5a8658b909
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_22
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] fix for required options on api call - change (mediawiki...BlueSpiceFoundation)

2015-04-24 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/206359

Change subject: fix for required options on api call
..

fix for required options on api call

(need cherry pick to REL1_23)

Change-Id: Iba469f364543c4f0fde8b786b5840474009d7ca9
---
M includes/CoreHooks.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/59/206359/1

diff --git a/includes/CoreHooks.php b/includes/CoreHooks.php
index 21b78cd..43b96ba 100755
--- a/includes/CoreHooks.php
+++ b/includes/CoreHooks.php
@@ -317,7 +317,8 @@
if (!$module instanceof ApiParse) {
return true;
}
-   if 
(Title::newFromText($module-getRequest()-getVal('page'))-userCan('read') == 
false){
+   $oTitle = Title::newFromText( $module-getRequest()-getVal( 
'page' ) );
+   if ( !is_null( $oTitle )  $oTitle-userCan( 'read' ) == false 
) {
$message = wfMessage('loginreqpagetext', 
wfMessage('loginreqlink')-plain())-plain();
return false;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba469f364543c4f0fde8b786b5840474009d7ca9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] fix for end of li, next lines will break - change (mediawiki...BlueSpiceSkin)

2015-04-22 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/205839

Change subject: fix for end of li, next lines will break
..

fix for end of li, next lines will break

Change-Id: Ida6488855d69cf2e0307050d999d2d102970fb29
---
M resources/components/skin.titleActions.less
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin 
refs/changes/39/205839/1

diff --git a/resources/components/skin.titleActions.less 
b/resources/components/skin.titleActions.less
index cf0e4b1..f875280 100644
--- a/resources/components/skin.titleActions.less
+++ b/resources/components/skin.titleActions.less
@@ -10,6 +10,7 @@
float: none;
clear: both;
content: ;
+   display: block;
 }
 
 ul#bs-title-actions li a{

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida6488855d69cf2e0307050d999d2d102970fb29
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] end float after li - change (mediawiki...BlueSpiceSkin)

2015-04-22 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/205823

Change subject: end float after li
..

end float after li

new fix after https://gerrit.wikimedia.org/r/#/c/205204/

Change-Id: I43f0e9529528b237b7a0dda36d560c2cd993
---
M resources/components/skin.titleActions.less
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin 
refs/changes/23/205823/1

diff --git a/resources/components/skin.titleActions.less 
b/resources/components/skin.titleActions.less
index a68dad9..cf0e4b1 100644
--- a/resources/components/skin.titleActions.less
+++ b/resources/components/skin.titleActions.less
@@ -6,6 +6,11 @@
display: block;
float: right;
 }
+ul#bs-title-actions:after{
+   float: none;
+   clear: both;
+   content: ;
+}
 
 ul#bs-title-actions li a{
display: block;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I43f0e9529528b237b7a0dda36d560c2cd993
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] end float after li - change (mediawiki...BlueSpiceSkin)

2015-04-22 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/205822

Change subject: end float after li
..

end float after li

new fix after https://gerrit.wikimedia.org/r/#/c/205204/

Change-Id: I43f0e9529528b237b7a0dda36d560c2cd993
---
M resources/components/skin.titleActions.less
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin 
refs/changes/22/205822/1

diff --git a/resources/components/skin.titleActions.less 
b/resources/components/skin.titleActions.less
index a68dad9..cf0e4b1 100644
--- a/resources/components/skin.titleActions.less
+++ b/resources/components/skin.titleActions.less
@@ -6,6 +6,11 @@
display: block;
float: right;
 }
+ul#bs-title-actions:after{
+   float: none;
+   clear: both;
+   content: ;
+}
 
 ul#bs-title-actions li a{
display: block;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I43f0e9529528b237b7a0dda36d560c2cd993
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] Flexiskin API changes - change (mediawiki...BlueSpiceExtensions)

2015-04-21 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/205541

Change subject: Flexiskin API changes
..

Flexiskin API changes

* changed Flexiskin Ajax calls to ApiBase module
* reduced methods in base class
* i18n included
* changed all ajax calls
* removed Ext.getCmp calls
* removed static class variables
* added hooks from REL1_2x
(this commit was reviewed in 182449)

Change-Id: If6a37061470aed33f8e99ca4dc32e0ba6f3c48f3
---
M Flexiskin/Flexiskin.class.php
M Flexiskin/Flexiskin.setup.php
A Flexiskin/doc/Hooks.txt
A Flexiskin/doc/TODO
M Flexiskin/i18n/de.json
M Flexiskin/i18n/en.json
M Flexiskin/i18n/qqq.json
A Flexiskin/includes/FlexiskinApi.class.php
A Flexiskin/includes/FlexiskinFormatter.class.php
M Flexiskin/resources/BS.Flexiskin/AddSkin.js
M Flexiskin/resources/BS.Flexiskin/Menuitems/General.js
M Flexiskin/resources/BS.Flexiskin/Menuitems/Header.js
M Flexiskin/resources/BS.Flexiskin/Menuitems/Position.js
M Flexiskin/resources/BS.Flexiskin/Panel.js
M Flexiskin/resources/BS.Flexiskin/PreviewMenu.js
M Flexiskin/resources/BS.Flexiskin/PreviewWindow.js
16 files changed, 996 insertions(+), 545 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/41/205541/1

diff --git a/Flexiskin/Flexiskin.class.php b/Flexiskin/Flexiskin.class.php
index 404f8b7..4f9ed91 100644
--- a/Flexiskin/Flexiskin.class.php
+++ b/Flexiskin/Flexiskin.class.php
@@ -38,28 +38,22 @@
  */
 class Flexiskin extends BsExtensionMW {
 
-   private static $iOldId = ;
-   private static $iNewId = ;
-   public static $sFlexiskinPath = ;
-
/**
 * Contructor of the Flexiskin class
 */
public function __construct() {
-   wfProfileIn('BS::' . __METHOD__);
+   wfProfileIn( 'BS::' . __METHOD__ );
$this-mExtensionFile = __FILE__;
-   $this-mExtensionType = EXTTYPE::OTHER; 
//SPECIALPAGE/OTHER/VARIABLE/PARSERHOOK
+   $this-mExtensionType = EXTTYPE::OTHER;
$this-mInfo = array(
EXTINFO::NAME = 'Flexiskin',
EXTINFO::DESCRIPTION = 'bs-flexiskin-desc',
EXTINFO::AUTHOR = 'Tobias Weichart',
-   EXTINFO::VERSION = 'default',
-   EXTINFO::STATUS  = 'default',
-   EXTINFO::PACKAGE = 'default',
+   EXTINFO::VERSION = 'default',
+   EXTINFO::STATUS = 'default',
+   EXTINFO::PACKAGE = 'default',
EXTINFO::URL = 'http://www.hallowelt.biz',
-   EXTINFO::DEPS = array(
-   'bluespice' = '2.22.0'
-   )
+   EXTINFO::DEPS = array( 'bluespice' = '2.22.0' )
);
$this-mExtensionKey = 'MW::Flexiskin';
 
@@ -69,255 +63,160 @@
'message' = 'bs-flexiskin-label'
) );
 
-   wfProfileOut('BS::' . __METHOD__);
+   wfProfileOut( 'BS::' . __METHOD__ );
}
 
/**
 * Initialization of ArticleInfo extension
 */
public function initExt() {
-   global $wgOut, $wgRequest, $wgUploadPath;
-   wfProfileIn('BS::' . __METHOD__);
+   global $wgOut, $wgUploadPath;
+   wfProfileIn( 'BS::' . __METHOD__ );
//$this-mCore-registerPermission('flexiskinchange');
-   self::$sFlexiskinPath = 
BsFileSystemHelper::getDataDirectory('flexiskin') . DS;
-   BsConfig::registerVar('MW::Flexiskin::Active', default, 
BsConfig::LEVEL_PUBLIC | BsConfig::TYPE_STRING | 
BsConfig::USE_PLUGIN_FOR_PREFS, 'bs-flexiskin-pref-active', 'select');
-   BsConfig::registerVar('MW::Flexiskin::Logo', , 
BsConfig::LEVEL_PUBLIC | BsConfig::TYPE_STRING | 
BsConfig::USE_PLUGIN_FOR_PREFS, 'bs-flexiskin-pref-logo', 'text');
-   if (self::getVal('flexiskin') || 
BsConfig::get('MW::Flexiskin::Active') != '') {
-   $sId = self::getVal('flexiskin') != '' ? 
self::getVal('flexiskin') : BsConfig::get('MW::Flexiskin::Active');
-   if ($sId != default)
-   $wgOut-addHeadItem('flexiskin', link 
rel='stylesheet' href=' . $wgUploadPath . /bluespice/flexiskin/ . $sId . 
/style . (self::getVal('preview', '') !=  ? '.tmp' : '') . .css');
+   BsConfig::registerVar( 'MW::Flexiskin::Active', default, 
BsConfig::LEVEL_PUBLIC | BsConfig::TYPE_STRING | 
BsConfig::USE_PLUGIN_FOR_PREFS, 'bs-flexiskin-pref-active', 'select' );
+   BsConfig::registerVar( 'MW::Flexiskin::Logo', , 
BsConfig::LEVEL_PUBLIC | BsConfig::TYPE_STRING | 
BsConfig::USE_PLUGIN_FOR_PREFS, 'bs-flexiskin-pref-logo', 'text' );
+   $sFlexiskin =

[MediaWiki-commits] [Gerrit] small display fix - change (mediawiki...BlueSpiceFoundation)

2015-04-20 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/205204

Change subject: small display fix
..

small display fix

Change-Id: I6f85728bd02a5d1c0eb2b233127242d86c67f04f
---
M includes/BsBaseTemplate.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/04/205204/1

diff --git a/includes/BsBaseTemplate.php b/includes/BsBaseTemplate.php
index 82faa3f..0d83279 100644
--- a/includes/BsBaseTemplate.php
+++ b/includes/BsBaseTemplate.php
@@ -693,6 +693,7 @@
);
$aOut[] = /li;
}
+   $aOut[] = 'li style=clear: both; float: none;/li';
$aOut[] = '/ul';
echo implode(\n, $aOut);
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f85728bd02a5d1c0eb2b233127242d86c67f04f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] temporary disabling box for user name, may be usefull later - change (mediawiki...BlueSpiceFoundation)

2015-04-20 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/205203

Change subject: temporary disabling box for user name, may be usefull later
..

temporary disabling box for user name, may be usefull later

Change-Id: Ib717e563c1a352ab460c3331e1ff0c0090550409
---
M resources/bluespice.extjs/bluespice.extjs.js
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/03/205203/1

diff --git a/resources/bluespice.extjs/bluespice.extjs.js 
b/resources/bluespice.extjs/bluespice.extjs.js
index b6d6e9a..edd827f 100644
--- a/resources/bluespice.extjs/bluespice.extjs.js
+++ b/resources/bluespice.extjs/bluespice.extjs.js
@@ -9,21 +9,21 @@
}));
 
//Experimental feature. May be improved in the future
-   $('a.mw-userlink').each(function(){
+   /*$('a.mw-userlink').each(function(){
 Ext.create('Ext.tip.ToolTip', {
title: $(this).data('bs-username'),
target: this,
anchor: 'right',
-   /*autoLoad: {
+   autoLoad: {
url: mw.util.wikiScript('api')
},
-   height: 200,*/
+   height: 200,
width: 200,
autoHide: false,
closable: true,
showDelay: 1000
 });
-   });
+   });*/
 
Ext.override(Ext.data.proxy.Server, {
buildRequest: function(){

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib717e563c1a352ab460c3331e1ff0c0090550409
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] added categoryhelper - change (mediawiki...BlueSpiceFoundation)

2015-04-16 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/204496

Change subject: added categoryhelper
..

added categoryhelper

Change-Id: I26ace2bdc9b85f8728041edf789297d10b75d954
---
M includes/AutoLoader.php
A includes/utility/CategoryHelper.class.php
2 files changed, 32 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/96/204496/1

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 3ef2e1b..59f6263 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -77,6 +77,7 @@
 $GLOBALS['wgAutoloadClasses']['BsFormatConverter'] = 
__DIR__./utility/FormatConverter.class.php;
 $GLOBALS['wgAutoloadClasses']['BsFileSystemHelper'] = 
__DIR__./utility/FileSystemHelper.class.php;
 $GLOBALS['wgAutoloadClasses']['BsGroupHelper'] = 
__DIR__./utility/GroupHelper.class.php;
+$GLOBALS['wgAutoloadClasses']['BsCategoryHelper'] = 
__DIR__./utility/CategoryHelper.class.php;
 $GLOBALS['wgAutoloadClasses']['BsUserHelper'] = 
__DIR__./utility/UserHelper.class.php;
 $GLOBALS['wgAutoloadClasses']['BsLinkProvider'] = 
__DIR__./utility/LinkProvider.class.php;
 $GLOBALS['wgAutoloadClasses']['BsNamespaceHelper'] = 
__DIR__./utility/NamespaceHelper.class.php;
diff --git a/includes/utility/CategoryHelper.class.php 
b/includes/utility/CategoryHelper.class.php
new file mode 100644
index 000..5b20799
--- /dev/null
+++ b/includes/utility/CategoryHelper.class.php
@@ -0,0 +1,31 @@
+?php
+
+class BsCategoryHelper {
+
+   /**
+* Returns an array of category objects
+* @return array
+*/
+   public static function getCategories() {
+   $aReturn = array ();
+
+   $dbr = wfGetDB( DB_SLAVE );
+   $res = $dbr-select(
+   array ( 'category' ),
+   array ( 'cat_id' )
+   );
+
+   if ( !$res ) {
+   return FormatJson::encode( $aReturn );
+   }
+   while ( $row = $res-fetchObject() ) {
+   $oCategory = Category::newFromID( $row-cat_id );
+   if ( is_null( $oCategory ) ) {
+   continue;
+   }
+   $aReturn [] = $oCategory;
+   }
+   return FormatJson::encode( $aReturn );
+   }
+
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I26ace2bdc9b85f8728041edf789297d10b75d954
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] added method getUserInGroups - change (mediawiki...BlueSpiceFoundation)

2015-04-14 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/204062

Change subject: added method getUserInGroups
..

added method getUserInGroups

Change-Id: Icf6952d1d991596a64736d19af81f73f49494b45
---
M includes/utility/GroupHelper.class.php
1 file changed, 21 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/62/204062/1

diff --git a/includes/utility/GroupHelper.class.php 
b/includes/utility/GroupHelper.class.php
index 5ee56c1..ec75b7f 100644
--- a/includes/utility/GroupHelper.class.php
+++ b/includes/utility/GroupHelper.class.php
@@ -140,5 +140,26 @@
 
return false;
}
+   
+   /**
+* Returns an array of User being in one or all groups given
+* @param mixed $aGroups
+* @return array Array of User objects
+*/
+   public static function getUserInGroups( $aGroups ) {
+   $dbr = wfGetDB( DB_SLAVE );
+   if ( !is_array( $aGroups ) ) {
+   $aGroups = array( $aGroups );
+   }
+   $aUser = array();
+   $res = $dbr-select( 'user_groups', array( 'ug_user' ), array( 
'ug_group' = $aGroups ), __METHOD__, array( 'DISTINCT' ) );
+   if ( !$res ) {
+   return $aUser;
+   }
+   while ( $row = $res-fetchObject() ) {
+   $aUser [] = User::newFromId( $row-ug_user );
+   }
+   return $aUser;
+   }
 
 }
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf6952d1d991596a64736d19af81f73f49494b45
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] added categoryhelper - change (mediawiki...BlueSpiceFoundation)

2015-04-13 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/203789

Change subject: added categoryhelper
..

added categoryhelper

Change-Id: Ic9ef31bf4628ff3ec6258b50a7e8a685c5f5076d
---
M includes/AutoLoader.php
A includes/utility/CategoryHelper.class.php
2 files changed, 31 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/89/203789/1

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 03fbc59..ca89ee9 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -77,6 +77,7 @@
 $GLOBALS['wgAutoloadClasses']['BsFormatConverter'] = 
__DIR__./utility/FormatConverter.class.php;
 $GLOBALS['wgAutoloadClasses']['BsFileSystemHelper'] = 
__DIR__./utility/FileSystemHelper.class.php;
 $GLOBALS['wgAutoloadClasses']['BsGroupHelper'] = 
__DIR__./utility/GroupHelper.class.php;
+$GLOBALS['wgAutoloadClasses']['BsCategoryHelper'] = 
__DIR__./utility/CategoryHelper.class.php;
 $GLOBALS['wgAutoloadClasses']['BsLinkProvider'] = 
__DIR__./utility/LinkProvider.class.php;
 $GLOBALS['wgAutoloadClasses']['BsNamespaceHelper'] = 
__DIR__./utility/NamespaceHelper.class.php;
 $GLOBALS['wgAutoloadClasses']['BsPageContentProvider'] = 
__DIR__./utility/PageContentProvider.class.php;
diff --git a/includes/utility/CategoryHelper.class.php 
b/includes/utility/CategoryHelper.class.php
new file mode 100644
index 000..f43c4e8
--- /dev/null
+++ b/includes/utility/CategoryHelper.class.php
@@ -0,0 +1,30 @@
+?php
+
+class BsCategoryHelper {
+
+   public static function getCategories() {
+   $aReturn = array(
+   'categories' = array(),
+   'totalCount' = 0
+   );
+
+   $dbr = wfGetDB( DB_SLAVE );
+   $res = $dbr-select(
+   array( 'category' ), array( 'cat_id' )
+   );
+
+   if ( !$res ) {
+   return FormatJson::encode( $aReturn );
+   }
+   while ( $row = $res-fetchObject() ) {
+   $oCategory = Category::newFromID( $row-cat_id );
+   if ( is_null( $oCategory ) ) {
+   continue;
+   }
+   $aReturn ['categories'][] = $oCategory;
+   }
+   $aReturn['totalCount'] = count( $aReturn['categories'] );
+   return FormatJson::encode( $aReturn );
+   }
+
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic9ef31bf4628ff3ec6258b50a7e8a685c5f5076d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] added userhelper - change (mediawiki...BlueSpiceFoundation)

2015-04-09 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/203036

Change subject: added userhelper
..

added userhelper

* added method getUserByRight
* moved getUserDisplayName from core, is now deprecated

Change-Id: I40a7bb9569a25b2411dcd70b67c5271915316cea
---
M includes/AutoLoader.php
M includes/Core.class.php
A includes/utility/UserHelper.class.php
3 files changed, 74 insertions(+), 17 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/36/203036/1

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 03fbc59..3ef2e1b 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -77,6 +77,7 @@
 $GLOBALS['wgAutoloadClasses']['BsFormatConverter'] = 
__DIR__./utility/FormatConverter.class.php;
 $GLOBALS['wgAutoloadClasses']['BsFileSystemHelper'] = 
__DIR__./utility/FileSystemHelper.class.php;
 $GLOBALS['wgAutoloadClasses']['BsGroupHelper'] = 
__DIR__./utility/GroupHelper.class.php;
+$GLOBALS['wgAutoloadClasses']['BsUserHelper'] = 
__DIR__./utility/UserHelper.class.php;
 $GLOBALS['wgAutoloadClasses']['BsLinkProvider'] = 
__DIR__./utility/LinkProvider.class.php;
 $GLOBALS['wgAutoloadClasses']['BsNamespaceHelper'] = 
__DIR__./utility/NamespaceHelper.class.php;
 $GLOBALS['wgAutoloadClasses']['BsPageContentProvider'] = 
__DIR__./utility/PageContentProvider.class.php;
diff --git a/includes/Core.class.php b/includes/Core.class.php
index 77a3ab9..554dab0 100644
--- a/includes/Core.class.php
+++ b/includes/Core.class.php
@@ -383,24 +383,13 @@
return $output;
}
 
+   /**
+* @deprecated since version 2.23.2
+* @param User $oUser
+* @return String
+*/
public static function getUserDisplayName( $oUser = null ) {
-   wfProfileIn( 'BS::'.__METHOD__ );
-   global $wgUser;
-   if ( $oUser === null ) {
-   $oUser = $wgUser;
-   }
-   if ( !( $oUser instanceof User ) ) {
-   wfProfileOut( 'BS::'.__METHOD__ );
-   return false;
-   }
-   $sRealname = $oUser-getRealName();
-   if ( $sRealname ) {
-   wfProfileOut( 'BS::'.__METHOD__ );
-   return $sRealname;
-   } else {
-   wfProfileOut( 'BS::'.__METHOD__ );
-   return $oUser-getName();
-   }
+   return BsUserHelper::getUserDisplayName($oUser);
}
 
/**
diff --git a/includes/utility/UserHelper.class.php 
b/includes/utility/UserHelper.class.php
new file mode 100644
index 000..620a43a
--- /dev/null
+++ b/includes/utility/UserHelper.class.php
@@ -0,0 +1,67 @@
+?php
+
+class BsUserHelper {
+
+   /**
+* Returns an array of user ids of users in the given group
+* @param String $sRight
+* @param Int $iLimit
+* @param Int $iOffset
+* @return array array of user ids
+*/
+   public static function getUserByRight( $sRight, $iLimit = 0, $iOffset = 
0 ) {
+   wfProfileIn( 'BS::' . __METHOD__ );
+   $aReturn = array();
+   $aGroups = BsGroupHelper::getGroupsByRight( $sRight );
+   if ( count( $aGroups )  1 ) {
+   wfProfileOut( 'BS::' . __METHOD__ );
+   return $aReturn;
+   }
+   $oDBr = wfGetDB( DB_SLAVE );
+   $sGroups = ;
+   foreach ( $aGroups as $key = $sGroup ) {
+   if ( $key != 0 ) {
+   $sGroups .= ,;
+   }
+   $sGroups .= ' . $sGroup . ';
+   }
+   $sCond = array( 'ug_group IN (' . $sGroups . ')' );
+   $sOptions = $iLimit == 0 ?  :  LIMIT  . $iLimit;
+   $sOptions .= $iOffset == 0 ?  :  OFFSET  . $iLimit;
+   $oRes = $oDBr-select( 'user_groups', array( 
'DISTINCT(ug_user)' ), $sCond, __METHOD__, $sOptions );
+   if ( !$oRes ) {
+   wfProfileOut( 'BS::' . __METHOD__ );
+   return $aReturn;
+   }
+   while ( $oRow = $oRes-fetchObject() ) {
+   $aReturn [] = (int) $oRow-ug_user;
+   }
+   wfProfileOut( 'BS::' . __METHOD__ );
+   return $aReturn;
+   }
+
+   /**
+* Returns the displayed name for the given user
+* @param User $oUser
+* @return mixed username, else false
+*/
+   public static function getUserDisplayName( $oUser = null ) {
+   wfProfileIn( 'BS::' . __METHOD__ );
+   if ( $oUser === null ) {
+   $oUser = RequestContext::getMain()-getUser();
+   }
+   if ( !(

[MediaWiki-commits] [Gerrit] small change for hook result - change (mediawiki...BlueSpiceExtensions)

2015-04-08 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/202687

Change subject: small change for hook result
..

small change for hook result

* needs cherry pick to REL1_23

Change-Id: Ibf9493d839269c9478a1058a0b286b72369ac43b
---
M TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/87/202687/1

diff --git a/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php 
b/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
index 2c20300..63c5d32 100644
--- a/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
+++ b/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
@@ -194,7 +194,10 @@
return true;
}
 
-   wfRunHooks('BSTopMenuBarCustomizerBeforeRenderNavigationSites', 
array( $aNavigationSites ));
+   $bResult = 
wfRunHooks('BSTopMenuBarCustomizerBeforeRenderNavigationSites', array( 
$aNavigationSites ));
+   if ($bResult === false){
+   return true;
+   }
 
$aOut= array();
$aOut[] = HTML::openElement( 'ul' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf9493d839269c9478a1058a0b286b72369ac43b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] small change for hook result - change (mediawiki...BlueSpiceExtensions)

2015-04-08 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/202688

Change subject: small change for hook result
..

small change for hook result

* needs cherry pick to REL1_23

Change-Id: Ibf9493d839269c9478a1058a0b286b72369ac43b
---
M TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/88/202688/1

diff --git a/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php 
b/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
index 2c20300..63c5d32 100644
--- a/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
+++ b/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
@@ -194,7 +194,10 @@
return true;
}
 
-   wfRunHooks('BSTopMenuBarCustomizerBeforeRenderNavigationSites', 
array( $aNavigationSites ));
+   $bResult = 
wfRunHooks('BSTopMenuBarCustomizerBeforeRenderNavigationSites', array( 
$aNavigationSites ));
+   if ($bResult === false){
+   return true;
+   }
 
$aOut= array();
$aOut[] = HTML::openElement( 'ul' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf9493d839269c9478a1058a0b286b72369ac43b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] Icons: Added hover state for sidebar icons - change (mediawiki...BlueSpiceSkin)

2015-04-07 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/202348

Change subject: Icons: Added hover state for sidebar icons
..

Icons: Added hover state for sidebar icons

Little rewrite of the sidebar icon CSS using LESS functions. It now also
supports hover state for Icons

THIS CHANGE BELONGS TO https://gerrit.wikimedia.org/r/201432

Needs merge to REL1_23

PatchSet 2:
* Removed unnecessary parent selector reference
* Added new extended sprite
* Added some default MediaWiki list item IDs

Change-Id: I45415f0e42e190bc18a041e94ed9f7dbf416e945
---
M resources/components/skin.icons.less
M resources/images/desktop/bs-nav-icon-sprite.png
2 files changed, 57 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin 
refs/changes/48/202348/1

diff --git a/resources/components/skin.icons.less 
b/resources/components/skin.icons.less
index 0df56c1..b9c4fa0 100644
--- a/resources/components/skin.icons.less
+++ b/resources/components/skin.icons.less
@@ -18,47 +18,81 @@
color: @bs-color-primary;
 }
 
+.icon24 {
+   display: inline-block;
+   height: 24px;
+   width: 24px;
+   margin-right: 4px;
+}
+
+.icon-mixin() {
+a .icon24 {
+   background-position: 0 @bg-pos-top;
+   }
+a:hover .icon24 {
+   background-position: -24px @bg-pos-top;
+   }
+}
+
 #bs-nav-sections {
-   #p-help, #p-navigation {
-   li  a {
-   display: table-cell;
-   vertical-align: middle;
-   height: 24px;
-   padding-left: 32px;
-   box-sizing: border-box;
+   .bs-nav-links {
+   .icon24 {
/*@embed*/
background-image: 
url(@{bs-skin-path}images/desktop/bs-nav-icon-sprite.png);
-   background-repeat: no-repeat;
-   background-position: 0 -144px;
+   display: block;
+   float: left;
+   }
+   li  a {
+   display: block;
+   min-height: 24px;
+   }
+
+   @bg-pos-top: -192px;
+   li {
+   .icon-mixin();
+   }
+
+   .bs-nav-item-text {
+   line-height: 22px; /* Has to be lower than icon height. 
Otherwise the text may break ugly */
}
}
 
-   li#n-mainpage  a {
-   background-position: 0 -72px;
+   li#n-mainpage,
+   li#n-mainpage-description {
+   @bg-pos-top: -120px;
+   .icon-mixin();
}
 
-   li#n-special-allpages  a {
-   background-position: 0 -24px;
+   li#n-special-allpages{
+   @bg-pos-top: -72px;
+   .icon-mixin();
}
 
-   li#n-special-categories  a {
-   background-position: 0 0;
+   li#n-special-categories {
+   @bg-pos-top: -48px;
+   .icon-mixin();
}
 
-   li#n-special-recentchanges  a {
-   background-position: 0 -120px;
+   li#n-special-recentchanges,
+   li#n-recentchanges {
+   @bg-pos-top: -168px;
+   .icon-mixin();
}
 
-   li#n-external-manuals  a {
-   background-position: 0 -48px;
+   li#n-external-manuals,
+   li#n-help{
+   @bg-pos-top: -96px;
+   .icon-mixin();
}
 
-   li#n-external-support  a {
-   background-position: 0 -168px;
+   li#n-external-support {
+   @bg-pos-top: -216px;
+   .icon-mixin();
}
 
-   li#n-external-contact  a {
-   background-position: 0 -96px;
+   li#n-external-contact {
+   @bg-pos-top: -144px;
+   .icon-mixin();
}
#bs-nav-tabs a{
font-size: 210%;
diff --git a/resources/images/desktop/bs-nav-icon-sprite.png 
b/resources/images/desktop/bs-nav-icon-sprite.png
index ed7353a..55dd9be 100644
--- a/resources/images/desktop/bs-nav-icon-sprite.png
+++ b/resources/images/desktop/bs-nav-icon-sprite.png
Binary files differ

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I45415f0e42e190bc18a041e94ed9f7dbf416e945
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] cherry pick from REL1_22 Change-Id: I6759c48b91afb9ac74edebe... - change (mediawiki...BlueSpiceExtensions)

2015-03-31 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/200815

Change subject: cherry pick from REL1_22 Change-Id: 
I6759c48b91afb9ac74edebed2c1e42989fa89052
..

cherry pick from REL1_22 Change-Id: I6759c48b91afb9ac74edebed2c1e42989fa89052

Change-Id: I31ab69f0959d48878862b8ccad609bf4c5b91dc8
---
M Flexiskin/Flexiskin.class.php
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/15/200815/1

diff --git a/Flexiskin/Flexiskin.class.php b/Flexiskin/Flexiskin.class.php
index 54c3167..943702b 100644
--- a/Flexiskin/Flexiskin.class.php
+++ b/Flexiskin/Flexiskin.class.php
@@ -294,7 +294,7 @@
$oStatus = BsFileSystemHelper::uploadFile(self::getVal('name'), 
flexiskin . DS . self::getVal('id') . DS . images);
 
if (!$oStatus-isGood())
-   $aResult = json_encode(array('success' = false, 'msg' 
= err_cd: . $aStatus['status']));
+   $aResult = json_encode(array('success' = false, 'msg' 
= err_cd: . $oStatus-getMessage()));
else
$aResult = json_encode(array('success' = true, 'name' 
= $oStatus-getValue()));
$oAjaxResponse = new AjaxResponse( $aResult );
@@ -313,7 +313,9 @@
$aConfigs = json_decode($aConfigs);
foreach ($aConfigs as $aConfig) {
$func = Flexiskin::format_ . $aConfig-id;
-   if (is_callable($func))
+   $bReturn = wfRunHooks(BSFlexiskinGenerateStyleFile, 
array($func, $aConfig));
+   
+   if ( $bReturn === true  is_callable($func))
$aFile[] = call_user_func($func, $aConfig);
}
return implode( \n, $aFile);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I31ab69f0959d48878862b8ccad609bf4c5b91dc8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] Removed LESS include path - change (mediawiki...BlueSpiceSkin)

2015-03-31 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/200816

Change subject: Removed LESS include path
..

Removed LESS include path

This caused trouble with existing customer skins and had no advantage at
the moment.

Change-Id: I72204d3472f1a1c471f3d71ef70e13795a887346
(cherry picked from commit 5c5692b294fdeade482ab762ede73f1b31ce0e49)
---
M BlueSpiceSkin.php
M includes/BlueSpiceSkinHooks.php
2 files changed, 2 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin 
refs/changes/16/200816/1

diff --git a/BlueSpiceSkin.php b/BlueSpiceSkin.php
index 2804f69..9d71af4 100644
--- a/BlueSpiceSkin.php
+++ b/BlueSpiceSkin.php
@@ -89,11 +89,6 @@
'myskin', 'nostalgia', 'simple', 'standard' );
 
 // Set LESS global variables
-   $localBasePath = dirname( __DIR__ );
-   $wgResourceLoaderLESSImportPaths = array_merge( 
$wgResourceLoaderLESSImportPaths, array(
-   $localBasePath/resources/,
-   ) );
-
 $wgResourceLoaderLESSVars += array(
'body-font-size' = '1em',
'bs-color-primary' = '#3e5389', //blue
@@ -118,4 +113,4 @@
'bs-width-page' = '1222px',
'bs-width-navcol' = '276px',
'bs-margin-left-content' = '302px'
-);
\ No newline at end of file
+);
diff --git a/includes/BlueSpiceSkinHooks.php b/includes/BlueSpiceSkinHooks.php
index 840788e..18ed4eb 100644
--- a/includes/BlueSpiceSkinHooks.php
+++ b/includes/BlueSpiceSkinHooks.php
@@ -83,7 +83,7 @@
'text' = wfMessage( 
'bs-navigation-contact' )-plain(),
'href' = 
'http://www.blue-spice.org/de/ueber-uns/kontakt-anfahrt/',
'id' = 'contact'
-   ),
+   )
)
);
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I72204d3472f1a1c471f3d71ef70e13795a887346
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] Removed LESS include path - change (mediawiki...BlueSpiceSkin)

2015-03-31 Thread Tweichart (Code Review)

Tweichart has submitted this change and it was merged.

Change subject: Removed LESS include path
..


Removed LESS include path

This caused trouble with existing customer skins and had no advantage at
the moment.

Change-Id: I72204d3472f1a1c471f3d71ef70e13795a887346
---
M BlueSpiceSkin.php
M includes/BlueSpiceSkinHooks.php
2 files changed, 1 insertion(+), 6 deletions(-)

Approvals:
  Tweichart: Looks good to me, approved



diff --git a/BlueSpiceSkin.php b/BlueSpiceSkin.php
index e193e40..fe7030a 100644
--- a/BlueSpiceSkin.php
+++ b/BlueSpiceSkin.php
@@ -89,11 +89,6 @@
'myskin', 'nostalgia', 'simple', 'standard' );
 
 // Set LESS global variables
-   $localBasePath = dirname( __DIR__ );
-   $wgResourceLoaderLESSImportPaths = array_merge( 
$wgResourceLoaderLESSImportPaths, array(
-   $localBasePath/resources/,
-   ) );
-
 $wgResourceLoaderLESSVars += array(
'body-font-size' = '1em',
'bs-color-primary' = '#3e5389', //blue
diff --git a/includes/BlueSpiceSkinHooks.php b/includes/BlueSpiceSkinHooks.php
index 840788e..18ed4eb 100644
--- a/includes/BlueSpiceSkinHooks.php
+++ b/includes/BlueSpiceSkinHooks.php
@@ -83,7 +83,7 @@
'text' = wfMessage( 
'bs-navigation-contact' )-plain(),
'href' = 
'http://www.blue-spice.org/de/ueber-uns/kontakt-anfahrt/',
'id' = 'contact'
-   ),
+   )
)
);
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I72204d3472f1a1c471f3d71ef70e13795a887346
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] cherry pick from REL1_22 Change-Id: I6759c48b91afb9ac74edebe... - change (mediawiki...BlueSpiceExtensions)

2015-03-31 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/200817

Change subject: cherry pick from REL1_22 Change-Id: 
I6759c48b91afb9ac74edebed2c1e42989fa89052
..

cherry pick from REL1_22 Change-Id: I6759c48b91afb9ac74edebed2c1e42989fa89052

Change-Id: I18379577769e889dc923d29644881957f63e6588
---
M Flexiskin/Flexiskin.class.php
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/17/200817/1

diff --git a/Flexiskin/Flexiskin.class.php b/Flexiskin/Flexiskin.class.php
index 54c3167..898fc01 100644
--- a/Flexiskin/Flexiskin.class.php
+++ b/Flexiskin/Flexiskin.class.php
@@ -294,7 +294,7 @@
$oStatus = BsFileSystemHelper::uploadFile(self::getVal('name'), 
flexiskin . DS . self::getVal('id') . DS . images);
 
if (!$oStatus-isGood())
-   $aResult = json_encode(array('success' = false, 'msg' 
= err_cd: . $aStatus['status']));
+   $aResult = json_encode(array('success' = false, 'msg' 
= err_cd: . $oStatus-getMessage()));
else
$aResult = json_encode(array('success' = true, 'name' 
= $oStatus-getValue()));
$oAjaxResponse = new AjaxResponse( $aResult );
@@ -313,7 +313,9 @@
$aConfigs = json_decode($aConfigs);
foreach ($aConfigs as $aConfig) {
$func = Flexiskin::format_ . $aConfig-id;
-   if (is_callable($func))
+   $bReturn = wfRunHooks(BSFlexiskinGenerateStyleFile, 
array($func, $aConfig));
+
+   if ( $bReturn === true  is_callable($func))
$aFile[] = call_user_func($func, $aConfig);
}
return implode( \n, $aFile);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I18379577769e889dc923d29644881957f63e6588
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] watchlist bug fixed where i18n was not loaded properly - change (mediawiki...BlueSpiceExtensions)

2015-03-31 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/200857

Change subject: watchlist bug fixed where i18n was not loaded properly
..

watchlist bug fixed where i18n was not loaded properly

Change-Id: I592fc6007304a0a05355d5f5e167699b5d975a22
---
M WatchList/WatchList.setup.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/57/200857/1

diff --git a/WatchList/WatchList.setup.php b/WatchList/WatchList.setup.php
index 3e25827..2ac2894 100644
--- a/WatchList/WatchList.setup.php
+++ b/WatchList/WatchList.setup.php
@@ -4,6 +4,6 @@
 
 $GLOBALS['wgAutoloadClasses']['WatchList'] = __DIR__ . '/WatchList.class.php';
 
-$wgMessagesDirs['WatchList'] = __DIR__ . '/i18n';
+$wgMessagesDirs['BSWatchList'] = __DIR__ . '/i18n'; //TODO: Must not be 
WatchList, somehting's overriding here otherwise
 
 $wgExtensionMessagesFiles['WatchList'] = __DIR__ . 
'/languages/WatchList.i18n.php';
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I592fc6007304a0a05355d5f5e167699b5d975a22
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] watchlist bug fixed where i18n was not loaded properly - change (mediawiki...BlueSpiceExtensions)

2015-03-31 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/200858

Change subject: watchlist bug fixed where i18n was not loaded properly
..

watchlist bug fixed where i18n was not loaded properly

Change-Id: I592fc6007304a0a05355d5f5e167699b5d975a22
---
M WatchList/WatchList.setup.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/58/200858/1

diff --git a/WatchList/WatchList.setup.php b/WatchList/WatchList.setup.php
index 3e25827..2ac2894 100644
--- a/WatchList/WatchList.setup.php
+++ b/WatchList/WatchList.setup.php
@@ -4,6 +4,6 @@
 
 $GLOBALS['wgAutoloadClasses']['WatchList'] = __DIR__ . '/WatchList.class.php';
 
-$wgMessagesDirs['WatchList'] = __DIR__ . '/i18n';
+$wgMessagesDirs['BSWatchList'] = __DIR__ . '/i18n'; //TODO: Must not be 
WatchList, somehting's overriding here otherwise
 
 $wgExtensionMessagesFiles['WatchList'] = __DIR__ . 
'/languages/WatchList.i18n.php';
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I592fc6007304a0a05355d5f5e167699b5d975a22
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] bugfix + hook added - change (mediawiki...BlueSpiceExtensions)

2015-03-30 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/200566

Change subject: bugfix + hook added
..

bugfix + hook added

* added hook to extend flexiskin, needs merge for 1.23 + wip
* smaller bugfix

Change-Id: I6759c48b91afb9ac74edebed2c1e42989fa89052
---
M Flexiskin/Flexiskin.class.php
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/66/200566/1

diff --git a/Flexiskin/Flexiskin.class.php b/Flexiskin/Flexiskin.class.php
index 255dc6a..94b6da8 100644
--- a/Flexiskin/Flexiskin.class.php
+++ b/Flexiskin/Flexiskin.class.php
@@ -298,7 +298,7 @@
$oStatus = BsFileSystemHelper::uploadFile(self::getVal('name'), 
flexiskin . DS . self::getVal('id') . DS . images);
 
if (!$oStatus-isGood())
-   $aResult = json_encode(array('success' = false, 'msg' 
= err_cd: . $aStatus['status']));
+   $aResult = json_encode(array('success' = false, 'msg' 
= err_cd: . $oStatus-getMessage()));
else
$aResult = json_encode(array('success' = true, 'name' 
= $oStatus-getValue()));
$oAjaxResponse = new AjaxResponse( $aResult );
@@ -317,7 +317,8 @@
$aConfigs = json_decode($aConfigs);
foreach ($aConfigs as $aConfig) {
$func = Flexiskin::format_ . $aConfig-id;
-   if (is_callable($func))
+   $bReturn = wfRunHooks(BSFlexiskinGenerateStyleFile, 
array($func, $aConfig));
+   if ( $bReturn === true  is_callable($func))
$aFile[] = call_user_func($func, $aConfig);
}
return implode( \n, $aFile);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6759c48b91afb9ac74edebed2c1e42989fa89052
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_22
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] added hook for manipulation of the listable view - change (mediawiki...BlueSpiceExtensions)

2015-03-20 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/198217

Change subject: added hook for manipulation of the listable view
..

added hook for manipulation of the listable view

Change-Id: I3f0b6311e2d7920db8fecf802d8f8f3080e75b08
(cherry picked from commit 1796e9ba28ce1c499dd56b808120c6934c4cd6e9)
---
M Statistics/includes/Charting.class.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/17/198217/1

diff --git a/Statistics/includes/Charting.class.php 
b/Statistics/includes/Charting.class.php
index 0c68695..0590d09 100644
--- a/Statistics/includes/Charting.class.php
+++ b/Statistics/includes/Charting.class.php
@@ -117,6 +117,7 @@
//$out .= $oDiagram-getFilterText();
//$out .= brn = .count( $data );
//$out .= /div;
+   wfRunHooks( 'BSStatisticsBeforeDrawTable', array( $oDiagram, 
$label, $data, $out) );
$out .= table width='80%' id='StatisticsTableView' border='0' 
cellspacing='0' cellpadding='4' class='sortable';
if ($label) {
$out .= 'theadtr';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f0b6311e2d7920db8fecf802d8f8f3080e75b08
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] added hook for manipulation of the listable view - change (mediawiki...BlueSpiceExtensions)

2015-03-20 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/198218

Change subject: added hook for manipulation of the listable view
..

added hook for manipulation of the listable view

Change-Id: I3f0b6311e2d7920db8fecf802d8f8f3080e75b08
(cherry picked from commit 1796e9ba28ce1c499dd56b808120c6934c4cd6e9)
---
M Statistics/includes/Charting.class.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/18/198218/1

diff --git a/Statistics/includes/Charting.class.php 
b/Statistics/includes/Charting.class.php
index 0c68695..0590d09 100644
--- a/Statistics/includes/Charting.class.php
+++ b/Statistics/includes/Charting.class.php
@@ -117,6 +117,7 @@
//$out .= $oDiagram-getFilterText();
//$out .= brn = .count( $data );
//$out .= /div;
+   wfRunHooks( 'BSStatisticsBeforeDrawTable', array( $oDiagram, 
$label, $data, $out) );
$out .= table width='80%' id='StatisticsTableView' border='0' 
cellspacing='0' cellpadding='4' class='sortable';
if ($label) {
$out .= 'theadtr';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f0b6311e2d7920db8fecf802d8f8f3080e75b08
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] changed return value so it works again for widgetbar - change (mediawiki...BlueSpiceExtensions)

2015-03-19 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/197865

Change subject: changed return value so it works again for widgetbar
..

changed return value so it works again for widgetbar

Change-Id: Ifd7357114d1dea332582554eb87bfc5395d9fd68
---
M SmartList/SmartList.class.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/65/197865/1

diff --git a/SmartList/SmartList.class.php b/SmartList/SmartList.class.php
index e712725..871a526 100644
--- a/SmartList/SmartList.class.php
+++ b/SmartList/SmartList.class.php
@@ -495,7 +495,7 @@
$aTmpViews = array();
$this-onBSWidgetBarGetDefaultWidgets( $aTmpViews, null, null );
 
-   return $aTmpViews;
+   return $aTmpViews['SMARTLIST'];
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd7357114d1dea332582554eb87bfc5395d9fd68
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] added hook for manipulation of the listable view - change (mediawiki...BlueSpiceExtensions)

2015-03-18 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/197488

Change subject: added hook for manipulation of the listable view
..

added hook for manipulation of the listable view

Change-Id: I3f0b6311e2d7920db8fecf802d8f8f3080e75b08
---
M Statistics/includes/Charting.class.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/88/197488/1

diff --git a/Statistics/includes/Charting.class.php 
b/Statistics/includes/Charting.class.php
index 0c68695..0590d09 100644
--- a/Statistics/includes/Charting.class.php
+++ b/Statistics/includes/Charting.class.php
@@ -117,6 +117,7 @@
//$out .= $oDiagram-getFilterText();
//$out .= brn = .count( $data );
//$out .= /div;
+   wfRunHooks( 'BSStatisticsBeforeDrawTable', array( $oDiagram, 
$label, $data, $out) );
$out .= table width='80%' id='StatisticsTableView' border='0' 
cellspacing='0' cellpadding='4' class='sortable';
if ($label) {
$out .= 'theadtr';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f0b6311e2d7920db8fecf802d8f8f3080e75b08
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_22
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] release notes changes - change (mediawiki...BlueSpiceFoundation)

2015-03-16 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/197018

Change subject: release notes changes
..

release notes changes

Change-Id: Id3a59e62f205d20d8be97769de4bd9451e452d0b
---
M BLUESPICE-RELEASE-HISTORY
M BLUESPICE-RELEASE-NOTES
M BlueSpiceFoundation.php
M includes/api/BsApiBase.php
M includes/installer/BsWebInstallerOutput.php
5 files changed, 292 insertions(+), 162 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/18/197018/1

diff --git a/BLUESPICE-RELEASE-HISTORY b/BLUESPICE-RELEASE-HISTORY
index e48c2e5..26bb39c 100644
--- a/BLUESPICE-RELEASE-HISTORY
+++ b/BLUESPICE-RELEASE-HISTORY
@@ -5,6 +5,227 @@
 
 = BlueSpice release notes =
 
+==BlueSpice 2.23.0==
+BlueSpice 2.23.0 is a minor and maintenance release.
+
+===Notable new features===
+* Internationalisation: BlueSpice is translated by the 
[https://translatewiki.net translatewiki.net] community. As of now it is 
completely available in Chinese (simplified), English, French, German, 
Macedonian, Russian, Spanish, Svedish and Ukrainian. There are 40 more 
languages with partial translations.
+* Internationalization: Existing English and German localisation was 
completely revised and checked for consistency.
+* Performance: BlueSpice now supports memcached caching and uses caching for 
its extensions. Expect a considerable performance increase.
+* Skinning: BlueSpice skin has been completely rewritten. It is now easier 
extensible and maintainable.
+* Skinning: There is a vector skin implementation for BlueSpice.
+* Skinning: User and BlueSpice preferences have been completely redesigned for 
better usability.
+* Skinning: Added MobileFronted extension for better mobile support (MW 1.23+)
+* Installation: An integrated package installer for MediaWiki and BlueSpice 
was added. Now you can set up MediaWiki and BlueSpice in one go.
+* Administration: Support for editing and deleting multiple items in most 
managers has been added.
+* Administration: PermissionManager was completely rewritten. It is now faster 
and way easier to use, e.g. with fullscreen mode and quick switch between 
groups.
+* Usability: In InsertFile dialogue, files can be found by their category.
+* ExtendedSearch: Opensearch is now supported. Search BlueSpice from your 
browser's searchbox.
+* ExtendedSearch: Precision has been improved by boosting content namespaces 
in scoring
+* Context menu: A right click menu has been added to links in the content area 
that leads you directly to the page's actions.
+
+
+===Changes since BlueSpice 2.23.0 beta===
+BlueSpiceFoundation
+* Fixed hook handler naming
+* Added missing headline message
+* Added ie8 indexOf fix
+* Translators on Special:Credits are read in on request
+* Improved documentation
+* Fixed logo issue on new installations
+* Removed jquery dependency
+* Fixed some styling issues with ExtJS windows
+* Removed text color styling for ExtJS windows
+* Fixed tooltip message keys
+* Fixed prepare message with html footer
+* Fixed some issues in preferences
+* Fixed issue in bluespice.util and bluespice.ping
+* Improved caching
+* Performance: Increased ping interval
+* Added update routine for new images
+* New default setting $wgRestrictDisplayTitle
+* Added cache key getter for extensions
+* Fixed css issue in multi select list
+* Fixed warning in validator
+* Added getter for last request in Ext.data.proxy.Server
+* Fixed a couple of issues with emails
+* Added class to navigation tab container
+* Removed strict due to extjs crashes
+* Fixed issue that more word queries return no results
+* Fixed preg_replace /e modifier deprecation error
+* Removed text-decoration from toolbar links in ExtJs Managers
+* Added CSS Fix for ExtJS
+* Removed installer i18n backward compatibility
+* Added compatibility with non-BsBaseTemplate skins
+* Clean up foundation
+* Added small BS_CACHE_DIR support
+* Added hook on CRUDPanel
+* Replaced search button due to the path included that wasnt needed
+* CAI TitleStore and DOMHelper additions
+* Fixed notices if no data is available
+* Moved view.Widget to BlueSpiceFoundation
+* Added hook for navigation manipulation
+
+BlueSpiceExtensions
+=Changes affecting some or all extensions=
+* Fixed some runtime issues
+* Improved Vector skin support
+* Removed some BsBaseTemplate switches
+* Fixed some issues in preferences
+* Don't use parse() for description
+* Changed display of links in widget bar
+* i18n: make extension descriptions translatable (thanks to Yuki Shira)
+* Added missing semicolons in js files
+
+=Changes affecting specific extension=
+* Avatars: Fixed not showing avatars
+* Authors: Fixed notice
+* Authors: Added a margin to author pictures
+* Authors: Fixed undefined index error on a fresh installation
+* Authors: Added GENDER support
+* Blog: Added caching for blog tags
+* Blog: Added

[MediaWiki-commits] [Gerrit] changed doc blocks in extension description - change (mediawiki...BlueSpiceExtensions)

2015-03-16 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/197009

Change subject: changed doc blocks in extension description
..

changed doc blocks in extension description

Change-Id: Idce9a5806319dfc8f1715d99bff66ebd80ff8c64
---
M ArticleInfo/ArticleInfo.class.php
M Authors/Authors.class.php
M Avatars/Avatars.class.php
M Blog/Blog.class.php
M BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.class.php
M CSyntaxHighlight/CSyntaxHighlight.class.php
M Checklist/Checklist.class.php
M ContextMenu/ContextMenu.class.php
M CountThings/CountThings.class.php
M Dashboards/Dashboards.class.php
M Emoticons/Emoticons.class.php
M ExtendedEditBar/ExtendedEditBar.class.php
M ExtendedSearch/ExtendedSearch.class.php
M ExtensionInfo/ExtensionInfo.class.php
M Flexiskin/Flexiskin.class.php
M FormattingHelp/FormattingHelp.class.php
M GroupManager/GroupManager.class.php
M HideTitle/HideTitle.class.php
M InsertCategory/InsertCategory.class.php
M InsertFile/InsertFile.class.php
M InsertLink/InsertLink.class.php
M InsertMagic/InsertMagic.class.php
M InterWikiLinks/InterWikiLinks.class.php
M NamespaceCss/NamespaceCss.class.php
M NamespaceManager/NamespaceManager.class.php
M Notifications/Notifications.class.php
M PageAccess/PageAccess.class.php
M PageTemplates/PageTemplates.class.php
M PagesVisited/PagesVisited.class.php
M PermissionManager/PermissionManager.class.php
M PermissionManager/resources/BS.PermissionManager/data/Manager.js
M Preferences/Preferences.class.php
M RSSFeeder/RSSFeeder.class.php
M RSSStandards/RSSStandards.class.php
M Readers/Readers.class.php
M ResponsibleEditors/ResponsibleEditors.class.php
M Review/Review.class.php
M SaferEdit/SaferEdit.class.php
M SecureFileStore/SecureFileStore.class.php
M ShoutBox/ShoutBox.class.php
M SmartList/SmartList.class.php
M StateBar/StateBar.class.php
M Statistics/Statistics.class.php
M TopMenuBarCustomizer/TopMenuBarCustomizer.class.php
M TopMenuBarCustomizer/includes/TopMenuBarCustomizerParser.php
M UEModulePDF/UEModulePDF.class.php
M UniversalExport/UniversalExport.class.php
M UserManager/UserManager.class.php
M UserPreferences/UserPreferences.class.php
M UserSidebar/UserSidebar.class.php
M VisualEditor/VisualEditor.class.php
M WantedArticle/WantedArticle.class.php
M WatchList/WatchList.class.php
M WhoIsOnline/WhoIsOnline.class.php
M WidgetBar/WidgetBar.class.php
M WikiAdmin/WikiAdmin.class.php
56 files changed, 182 insertions(+), 522 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/09/197009/1

diff --git a/ArticleInfo/ArticleInfo.class.php 
b/ArticleInfo/ArticleInfo.class.php
index af4eeff..f87efa3 100644
--- a/ArticleInfo/ArticleInfo.class.php
+++ b/ArticleInfo/ArticleInfo.class.php
@@ -23,31 +23,13 @@
  *
  * @author Markus Glaser gla...@hallowelt.biz
  * @author Stephan Muggli mug...@hallowelt.biz
- * @version2.22.0
+ * @version2.23.1
  * @packageBlueSpice_Extensions
  * @subpackage ArticleInfo
  * @copyright  Copyright (C) 2011 Hallo Welt! - Medienwerkstatt GmbH, All 
rights reserved.
  * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v2 or 
later
  * @filesource
  */
-
-/* Changelog
- * v1.20.0
- *
- * v1.1.0
- * - Added subpages info (new FD)
- * v1.0.0
- * - Stable state
- * - Added events
- * v0.3.0b
- * - Renewed StatusBar architecture
- * - Modified views
- * - Date is now clickable and links to the articles historypage
- * v0.2.0b
- * - Added views
- * v0.1.0b
- * FIRST CHANGES
-*/
 
 /**
  * Base class for ArticleInfo extension
diff --git a/Authors/Authors.class.php b/Authors/Authors.class.php
index b92c03a..3383880 100644
--- a/Authors/Authors.class.php
+++ b/Authors/Authors.class.php
@@ -23,32 +23,13 @@
  *
  * @author Markus Glaser gla...@hallowelt.biz
  * @author Robert Vogel vo...@hallowelt.biz
- * @version2.22.0
+ * @version2.23.1
  * @packageBlueSpice_Extensions
  * @subpackage Authors
  * @copyright  Copyright (C) 2011 Hallo Welt! - Medienwerkstatt GmbH, All 
rights reserved.
  * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v2 or 
later
  * @filesource
  */
-
-/* Changelog
-  * v1.20.0
-  *
-  * v1.0.0
-  * - Stable state
-  * - Adjusted to fit Functional Desgin
-  * v0.3
-  * - added view class
-  * v0.2.1
-  * - Removed DEFINEs and added them to standard config.
-  * - Little code refactoring / beautifing
-  * v0.2
-  * - output is created directly as html
-  * - default image is shipped with extension
-  * - some i18n
-  * v0.1
-  * - initial version
-  */
 
 //Last review MRG (30.06.11 10:25)
 
diff --git a/Avatars/Avatars.class.php b/Avatars/Avatars.class.php
index 85c8011..e26296b 100644
--- a/Avatars/Avatars.class.php
+++ b/Avatars/Avatars.class.php
@@ -23,8 +23,7 @@
  * For further information visit http://www.blue-spice.org
  *
  * @author Marc Reymann reym...@hallowelt.biz
- * @version

[MediaWiki-commits] [Gerrit] changed pdf export link to be displayed in the toolbox if bl... - change (mediawiki...BlueSpiceExtensions)

2015-03-12 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/196169

Change subject: changed pdf export link to be displayed in the toolbox if 
bluespiceskin is not active
..

changed pdf export link to be displayed in the toolbox if bluespiceskin is not 
active

Change-Id: I1d3461c87b605dd37adf22a39c265aaf94045e05
---
M UEModulePDF/UEModulePDF.class.php
1 file changed, 56 insertions(+), 28 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/69/196169/1

diff --git a/UEModulePDF/UEModulePDF.class.php 
b/UEModulePDF/UEModulePDF.class.php
index 1c8698c..4980d66 100644
--- a/UEModulePDF/UEModulePDF.class.php
+++ b/UEModulePDF/UEModulePDF.class.php
@@ -93,6 +93,7 @@
$this-setHook('BSUniversalExportGetWidget');
$this-setHook('BSUniversalExportSpecialPageExecute');
$this-setHook('SkinTemplateOutputPageBeforeExec');
+   $this-setHook('BaseTemplateToolbox');
wfProfileOut( 'BS::'.__METHOD__ );
}
 
@@ -200,7 +201,58 @@
return true;
}
 
-   public function onSkinTemplateOutputPageBeforeExec($skin, $template){
+   /**
+* Hook to insert the PDF-Export link if BlueSpiceSkin is active
+* @param SkinTemplate $oSkin
+* @param QuickTemplate $oTemplate
+* @return boolean
+*/
+   public function onSkinTemplateOutputPageBeforeExec( $oSkin, 
$oTemplate ) {
+   if ( !$oTemplate instanceof BsBaseTemplate ) {
+   return true;
+   }
+
+   $oTemplate-data['bs_title_actions'][] = 
$this-buildContentAction();
+
+   return true;
+   }
+
+   /**
+* Hook to be executed when the Vector Skin is activated to add the 
PDF-Export Link to the Toolbox
+* @param SkinTemplate $oTemplate
+* @param Array $aToolbox
+* @return boolean
+*/
+   public function onBaseTemplateToolbox( $oTemplate, $aToolbox ) {
+   $oTitle = RequestContext::getMain()-getTitle();
+   //if the BlueSpiceSkin is activated we don't need to add the 
Link to the Toolbox,
+   //onSkinTemplateOutputPageBeforeExec will handle it
+   if ( $oTemplate instanceof BsBaseTemplate || 
!$oTitle-isContentPage() ) {
+   return true;
+   }
+
+   //if print is set insert pdf export afterwards
+   if ( isset( $aToolbox['print'] ) ) {
+   $aToolboxNew = array();
+   foreach ( $aToolbox as $sKey = $aValue ) {
+   $aToolboxNew[$sKey] = $aValue;
+   if ( $sKey === print ) {
+   $aToolboxNew['uemodulepdf'] = 
$this-buildContentAction();
+   }
+   }
+   $aToolbox = $aToolboxNew;
+   } else {
+   $aToolbox['uemodulepdf'] = $this-buildContentAction();
+   }
+
+   return true;
+   }
+
+   /**
+* Builds the ContentAction Array fort the current page
+* @return Array The ContentAction Array
+*/
+   private function buildContentAction() {
$aCurrentQueryParams = $this-getRequest()-getValues();
if ( isset( $aCurrentQueryParams['title'] ) ) {
$sTitle = $aCurrentQueryParams['title'];
@@ -213,37 +265,13 @@
unset( $aCurrentQueryParams['title'] );
}
$aCurrentQueryParams['ue[module]'] = 'pdf';
-   $aContentActions = array(
+   return array(
'id' = 'bs-ta-uemodulepdf',
'href' = $oSpecialPage-getLinkUrl( 
$aCurrentQueryParams ),
'title' = wfMessage( 
'bs-uemodulepdf-widgetlink-single-no-attachments-title' )-text(),
-   'text' = 
wfMessage('bs-uemodulepdf-widgetlink-single-no-attachments-text')-text(),
+   'text' = wfMessage( 
'bs-uemodulepdf-widgetlink-single-no-attachments-text' )-text(),
'class' = 'icon-file-pdf'
);
-
-   if ( $template instanceof BsBaseTemplate ) {
-   $template-data['bs_title_actions'][] = 
$aContentActions;
-   } else {
-   //this is the case when BlueSpice Skin is not active, 
so use vector methods.
-   $template-data['prebodyhtml'] = Html::rawElement(
-   span,
-   array('class' = 
'bs-ta-uemodulepdf-container'),
-   Html::rawElement(
-   'a',
-

1 2 3 >

1 - 100 of 255 matches

Mail list logo