Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/143842
Change subject: Fixes for new skin
......................................................................
Fixes for new skin
removed legacy CSS
added minimalistic CSS for user page settings
fixed user page settings
Change-Id: I8fe9ee2b326e803ec0d2c0bbfd71706b3ecdbcc2
---
M includes/BsBaseTemplate.php
M includes/CoreHooks.php
M resources/bluespice/bluespice.css
3 files changed, 22 insertions(+), 64 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/42/143842/1
diff --git a/includes/BsBaseTemplate.php b/includes/BsBaseTemplate.php
index 06d5efb..7376586 100644
--- a/includes/BsBaseTemplate.php
+++ b/includes/BsBaseTemplate.php
@@ -180,6 +180,7 @@
$this->sortDataArrayByPosition($this->data['bs_dataAfterContent']);
$aDACList = array();
+ $aDACList[] = '<ul id="bs-data-after-content-tabs">';
$aDACContents = array();
foreach( $this->data['bs_dataAfterContent'] as $key => $item ) {
if ( $item instanceof ViewBaseElement ) {
@@ -210,10 +211,7 @@
);
}
}
- if ( RequestContext::getMain()->getTitle()->getNamespace() !==
NS_USER ) {
- array_unshift( $aDACList, '<ul
id="bs-data-after-content-tabs">' );
- $aDACList[] = '</ul>';
- }
+ $aDACList[] = '</ul>';
$this->set(
'dataAfterContent',
diff --git a/includes/CoreHooks.php b/includes/CoreHooks.php
index 67ffc95..aeb8c84 100755
--- a/includes/CoreHooks.php
+++ b/includes/CoreHooks.php
@@ -459,12 +459,13 @@
return;
}
- array_unshift( $template->data['bs_title_actions'], array(
- 'id' => 'filedownload',
+ $template->data['bs_title_actions'][5] = array(
+ 'id' => 'bs-ta-filedownload',
'href' => $oFile->getFullUrl(),
'title' => $oFile->getName(),
- 'text' =>
wfMessage('bs-imagepage-download-text')->plain()
- ));
+ 'text' =>
wfMessage('bs-imagepage-download-text')->plain(),
+ 'class' => 'icon-download'
+ );
}
/**
@@ -486,7 +487,7 @@
$oUserPageSettingsView = new ViewBaseElement();
$oUserPageSettingsView->setAutoWrap(
- '<div id="bs-usersidebar-settings"
class="bs-userpagesettings-item">'.
+ '<div id="bs-userpreferences-settings"
class="bs-userpagesettings-item">'.
'###CONTENT###'.
'</div>'
);
@@ -512,17 +513,20 @@
$oProfilePageSettingsView = new ViewBaseElement();
$oProfilePageSettingsView->setId('bs-userpagesettings');
+ $sLabel = wfMessage('bs-userpagesettings-legend')->plain();
$oProfilePageSettingsFieldsetView = new
ViewFormElementFieldset();
- $oProfilePageSettingsFieldsetView->setLabel(
- wfMessage('bs-userpagesettings-legend')->plain()
- );
+ $oProfilePageSettingsFieldsetView->setLabel( $sLabel );
foreach ( $aSettingViews as $oSettingsView ) {
$oProfilePageSettingsFieldsetView->addItem($oSettingsView);
}
$oProfilePageSettingsView->addItem(
$oProfilePageSettingsFieldsetView );
- $template->data['bs_dataAfterContent']['profilepagesettings'] =
$oProfilePageSettingsView;
+ $template->data['bs_dataAfterContent']['profilepagesettings'] =
array(
+ 'position' => 5,
+ 'label' => $sLabel,
+ 'content' => $oProfilePageSettingsView
+ );
}
}
\ No newline at end of file
diff --git a/resources/bluespice/bluespice.css
b/resources/bluespice/bluespice.css
index 7f2ab51..f473b1e 100644
--- a/resources/bluespice/bluespice.css
+++ b/resources/bluespice/bluespice.css
@@ -1,54 +1,3 @@
-
-.hw-button-a {
- margin-right:2px;
- margin-bottom:2px;
- cursor:pointer;
-}
-
-.hw-button-left {
- float:left;
- padding:0px;
- margin:0px;
- border:0px;
- height:22px;
- margin-bottom:2px;
- /*@embed*/
- background: url("images/btn_left.gif");
-}
-
-.hw-button-img {
- padding:0px;
- padding-left:3px;
- margin:0px;
- border:0px;
- float:left;
-}
-
-.hw-button-middle {
- /*@embed*/
- background-image:url("images/btn_middle.gif");
- float:left;
- padding:0px;
- padding-left:3px;
- padding-top:2px;
- background-repeat:repeat-x;
- margin:0px;
- border:0px;
- height:22px;
- margin-bottom:2px;
- font-size:11px;
-}
-
-.hw-button-right {
- padding:0px;
- margin:0px;
- border:0px;
- float:left;
- height:22px;
- margin-bottom:2px;
- margin-right:2px;
-}
-
.bs-actions-filedownload {
width: 116px;
text-align: center;
@@ -68,4 +17,11 @@
/*@embed*/
background-image:url("images/download-file_btn-hover.png");
text-decoration: none;
+}
+
+.bs-userpagesettings-item {
+ float: left;
+ margin-right: 2em;
+ font-size: 80%;
+ text-align: center;
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/143842
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8fe9ee2b326e803ec0d2c0bbfd71706b3ecdbcc2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel <vo...@hallowelt.biz>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
