Tweichart has submitted this change and it was merged.
Change subject: BS223: styling + fixes
......................................................................
BS223: styling + fixes
* moved footer-info to statebar
* fixed some issues with empty messages from api, led to never ending statebar
Change-Id: I5ffc2c3f920aae59bc4471affa89f627ca3f3091
---
M StateBar/StateBar.class.php
M StateBar/resources/bluespice.StateBar.css
M StateBar/resources/bluespice.StateBar.js
3 files changed, 29 insertions(+), 23 deletions(-)
Approvals:
Tweichart: Verified; Looks good to me, approved
diff --git a/StateBar/StateBar.class.php b/StateBar/StateBar.class.php
index a09c706..86d8ab2 100644
--- a/StateBar/StateBar.class.php
+++ b/StateBar/StateBar.class.php
@@ -162,7 +162,8 @@
);
$iArticleID = RequestContext::getMain()->getRequest()->getInt(
'articleID', 0 );
- if( empty($iArticleID) ) {
+ if( $iArticleID === 0 ) {
+ $aResult['message'] =
wfMessage("bs-statebar-ajax-nobodyviews")->plain();
return FormatJson::encode($aResult);
}
@@ -175,6 +176,7 @@
//also prevents from get wrong data in
redirect redirect
);
if( is_null($oTitle) ) {
+ $aResult['message'] =
wfMessage("bs-statebar-ajax-nobodyviews")->plain();
return json_encode( $aResult );
}
diff --git a/StateBar/resources/bluespice.StateBar.css
b/StateBar/resources/bluespice.StateBar.css
index 6bfcffd..fa36436 100644
--- a/StateBar/resources/bluespice.StateBar.css
+++ b/StateBar/resources/bluespice.StateBar.css
@@ -56,7 +56,10 @@
display: inline-block;
text-decoration: none;
}
-
+#bs-statebar-view ul#footer-info{
+ display: block;
+ list-style: none;
+}
#bs-statebar {
background-color: #eee;
clear: both;
diff --git a/StateBar/resources/bluespice.StateBar.js
b/StateBar/resources/bluespice.StateBar.js
index d7e3746..bf633a4 100644
--- a/StateBar/resources/bluespice.StateBar.js
+++ b/StateBar/resources/bluespice.StateBar.js
@@ -42,31 +42,32 @@
params,
function( result ) {
$(document).trigger( 'BsStateBarBodyLoad',
[result] );
- if ( result['success'] === true ) {
-
$('#sStateBarBodyLoadView').slideToggle('fast');
+ $('#sStateBarBodyLoadView').slideToggle('fast');
- if ( result['views'].length < 1 ) {
- var messageItem = $('<div
class="bs-statebar-body-item style="display:none"><p>' + result['message'] +
'</p></div>').filter('DIV.bs-statebar-body-item');
-
BsStateBar.oStateBarView.append(messageItem.slideToggle('fast'));
- $.each(
BsStateBar.aRegisteredToggleClickElements, function( key, value ) {
-
BsStateBar.viewTogglerClick(value);
- });
- return;
- }
-
- $.each(result['views'], function( key,
value ) {
- var bodyItem =
$(value).filter('DIV.bs-statebar-body-item');
- bodyItem.hide();
-
BsStateBar.oStateBarView.append(bodyItem.slideToggle('fast'));
- });
-
- $(document).trigger(
'BsStateBarBodyLoadComplete', [result['views'], result] );
-
-
$.each(BsStateBar.aRegisteredToggleClickElements, function( key, value ) {
+ if ( result['views'].length < 1 ) {
+ var messageItem = $('<div
class="bs-statebar-body-item style="display:none"><p>' + result['message'] +
'</p></div>').filter('DIV.bs-statebar-body-item');
+
BsStateBar.oStateBarView.append(messageItem.slideToggle('fast'));
+ $.each(
BsStateBar.aRegisteredToggleClickElements, function( key, value ) {
BsStateBar.viewTogglerClick(value);
});
- } else {
+ return;
}
+
+ $.each(result['views'], function( key, value ) {
+ var bodyItem =
$(value).filter('DIV.bs-statebar-body-item');
+ bodyItem.hide();
+
BsStateBar.oStateBarView.append(bodyItem.slideToggle('fast'));
+ });
+ if ($("#footer-info").length !== 0 ){
+ BsStateBar.oStateBarView.append($("<div
class='clearfix'></div>"));
+
BsStateBar.oStateBarView.append($("#footer-info"));
+ }
+
+ $(document).trigger(
'BsStateBarBodyLoadComplete', [result['views'], result] );
+
+
$.each(BsStateBar.aRegisteredToggleClickElements, function( key, value ) {
+ BsStateBar.viewTogglerClick(value);
+ });
}
);
this.bAjaxCallComplete = true;
--
To view, visit https://gerrit.wikimedia.org/r/151276
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5ffc2c3f920aae59bc4471affa89f627ca3f3091
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart <weich...@hallowelt.biz>
Gerrit-Reviewer: Mglaser <gla...@hallowelt.biz>
Gerrit-Reviewer: Pigpen <reym...@hallowelt.biz>
Gerrit-Reviewer: Pwirth <wi...@hallowelt.biz>
Gerrit-Reviewer: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: Smuggli <mug...@hallowelt.biz>
Gerrit-Reviewer: Tweichart <weich...@hallowelt.biz>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
