Pigpen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102946
Change subject: Latest state of development
......................................................................
Latest state of development
Change-Id: I9122abe2c912d59feeef6a15a7373981ac7c64de
---
M BlueSpiceSkin.php
M BlueSpiceSkin.skin.php
M includes/BlueSpiceSkinHooks.php
M resources/bluespiceskin.content.css
M resources/bluespiceskin.fonts.css
M resources/bluespiceskin.form.css
A resources/bluespiceskin.icons.css
M resources/bluespiceskin.main.js
M resources/bluespiceskin.skin.main.css
M resources/bluespiceskin.skin.main.js
M resources/fonts/muli_300.ttf
M resources/fonts/muli_regular.ttf
M resources/fonts/open_sans_300.ttf
M resources/fonts/open_sans_300italic.ttf
M resources/fonts/open_sans_600.ttf
M resources/fonts/open_sans_600italic.ttf
M resources/fonts/open_sans_700.ttf
M resources/fonts/open_sans_700italic.ttf
M resources/fonts/open_sans_800.ttf
M resources/fonts/open_sans_800italic.ttf
M resources/fonts/open_sans_condensed 300.ttf
M resources/fonts/open_sans_condensed 300italic.ttf
M resources/fonts/open_sans_condensed 700.ttf
M resources/fonts/open_sans_italic.ttf
M resources/fonts/open_sans_regular.ttf
M resources/fonts/raleway_300.ttf
M resources/fonts/raleway_500.ttf
M resources/fonts/source_sans_pro_300.ttf
M resources/fonts/source_sans_pro_600.ttf
A resources/images/desktop/bs-add.png
A resources/images/desktop/bs-delete.png
31 files changed, 202 insertions(+), 146 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin
refs/changes/46/102946/1
diff --git a/BlueSpiceSkin.php b/BlueSpiceSkin.php
index 18948cc..ba0e324 100644
--- a/BlueSpiceSkin.php
+++ b/BlueSpiceSkin.php
@@ -12,7 +12,7 @@
die("This is an extension to the MediaWiki package and cannot be run
standalone.");
$wgSkipSkins = array( 'chick', 'cologneblue', 'common', 'modern', 'monobook',
'myskin', 'nostalgia', 'simple', 'standard', 'vector' );
-$wgAutoloadClasses['Mobile_Detect'] = dirname(__FILE__) .
'/includes/lib/Mobile_Detect.php';
+$wgAutoloadClasses['Mobile_Detect'] = __DIR__ .
'/includes/lib/Mobile_Detect.php';
global $oMobileDetect;
$oMobileDetect = new Mobile_Detect();
@@ -27,8 +27,8 @@
$wgValidSkinNames['bluespiceskinmobile'] = 'BlueSpiceSkinMobile';
- $wgAutoloadClasses['SkinBlueSpiceSkinMobile'] = dirname(__FILE__) .
'/BlueSpiceSkinMobile.skin.php';
- $wgAutoloadClasses['BlueSpiceSkinMobileTemplate'] = dirname(__FILE__) .
'/BlueSpiceSkinMobile.skin.php';
+ $wgAutoloadClasses['SkinBlueSpiceSkinMobile'] = __DIR__ .
'/BlueSpiceSkinMobile.skin.php';
+ $wgAutoloadClasses['BlueSpiceSkinMobileTemplate'] = __DIR__ .
'/BlueSpiceSkinMobile.skin.php';
$wgHooks['OutputPageBodyAttributes'][] =
"BlueSpiceSkinMobileTemplate::onBSAddBodyAttribute";
@@ -54,7 +54,7 @@
'localBasePath' => &$GLOBALS['wgStyleDirectory'],
'remoteBasePath' => &$GLOBALS['wgStylePath']
);
- $wgExtensionMessagesFiles['BlueSpiceSkin'] = dirname(__FILE__) .
'/BlueSpiceSkin.i18n.php';
+ $wgExtensionMessagesFiles['BlueSpiceSkin'] = __DIR__ .
'/BlueSpiceSkin.i18n.php';
$wgDefaultSkin = "bluespiceskinmobile";
return;
}
@@ -69,19 +69,20 @@
$wgValidSkinNames['bluespiceskin'] = 'BlueSpiceSkin';
-$wgAutoloadClasses['SkinBlueSpiceSkin'] = dirname(__FILE__) .
'/BlueSpiceSkin.skin.php';
-$wgAutoloadClasses['BlueSpiceSkinTemplate'] = dirname(__FILE__) .
'/BlueSpiceSkin.skin.php';
-$wgAutoloadClasses['BlueSpiceSkinHooks'] = dirname(__FILE__) .
'/includes/BlueSpiceSkinHooks.php';
-$wgAutoloadClasses['ViewStateBarTopElementTools'] = dirname(__FILE__) .
'/views/view.StateBarTopElementTools.php';
-$wgAutoloadClasses['ViewStateBarTopElementWatch'] = dirname(__FILE__) .
'/views/view.StateBarTopElementWatch.php';
+$wgAutoloadClasses['SkinBlueSpiceSkin'] = __DIR__ . '/BlueSpiceSkin.skin.php';
+$wgAutoloadClasses['BlueSpiceSkinTemplate'] = __DIR__ .
'/BlueSpiceSkin.skin.php';
+$wgAutoloadClasses['BlueSpiceSkinHooks'] = __DIR__ .
'/includes/BlueSpiceSkinHooks.php';
+$wgAutoloadClasses['ViewStateBarTopElementTools'] = __DIR__ .
'/views/view.StateBarTopElementTools.php';
+$wgAutoloadClasses['ViewStateBarTopElementWatch'] = __DIR__ .
'/views/view.StateBarTopElementWatch.php';
-$wgExtensionMessagesFiles['BlueSpiceSkin'] = dirname(__FILE__) .
'/BlueSpiceSkin.i18n.php';
+$wgExtensionMessagesFiles['BlueSpiceSkin'] = __DIR__ .
'/BlueSpiceSkin.i18n.php';
$wgHooks['SkinTemplateOutputPageBeforeExec'][] =
"BlueSpiceSkinHooks::onSkinTemplateOutputPageBeforeExec";
$wgHooks['BSStateBarBeforeTopViewAdd'][] =
"BlueSpiceSkinHooks::onBSStateBarBeforeTopViewAdd";
$wgHooks['DoEditSectionLink'][] = "BlueSpiceSkinHooks::onDoEditSectionLink";
$wgHooks['SkinBuildSidebar'][] = 'BlueSpiceSkinHooks::onSkinBuildSidebar';
$wgHooks['BSGetLogo'][] = "BlueSpiceSkinHooks::onBSGetLogo";
+$wgHooks['VisualEditorConfig'][] = "BlueSpiceSkinHooks::onVisualEditorConfig";
$wgResourceModules['ext.bluespice.bluespiceskin.js'] = array(
'scripts' => array(
@@ -151,4 +152,13 @@
'localBasePath' => &$GLOBALS['wgStyleDirectory'],
'remoteBasePath' => &$GLOBALS['wgStylePath']
);
+$wgResourceModules['ext.bluespice.bluespiceskin.icons'] = array(
+ 'styles' => array(
+ 'BlueSpiceSkin/resources/bluespiceskin.icons.css',
+ ),
+ 'position' => 'top',
+ 'group' => 'site',
+ 'localBasePath' => &$GLOBALS['wgStyleDirectory'],
+ 'remoteBasePath' => &$GLOBALS['wgStylePath']
+);
$wgDefaultSkin = "bluespiceskin";
\ No newline at end of file
diff --git a/BlueSpiceSkin.skin.php b/BlueSpiceSkin.skin.php
index e12b322..f02ef90 100644
--- a/BlueSpiceSkin.skin.php
+++ b/BlueSpiceSkin.skin.php
@@ -308,7 +308,7 @@
$aPortlets = array();
foreach ($this->data['sidebar'] as $bar => $cont) {
- $sTitle = wfEmptyMsg($bar, wfMsg($bar)) ? $bar :
wfMsg($bar);
+ $sTitle = wfEmptyMsg($bar, wfMessage($bar)->plain()) ?
$bar : wfMessage($bar)->plain();
$aOut = array();
if ($bar == 'TOOLBOX') {
@@ -418,7 +418,7 @@
foreach ( $aRegisteredModules as $sModuleKey =>
$aModulParams ) {
$skeyLower = strtolower($sModuleKey);
- $sModulLabel = wfMsg( 'bs-' . $skeyLower .
'-label' );
+ $sModulLabel = wfMessage( 'bs-' . $skeyLower .
'-label' )->plain();
$sUrl =
$oWikiAdminSpecialPageTitle->getLocalURL('mode=' . $sModuleKey);
$aPointsAdmin [$sModulLabel] = $sUrl;
}
@@ -447,12 +447,12 @@
if ( $wgUser->isLoggedIn() ) {
$sButtonUserImage = 'account-icon.png';
- $sLoginSwitchTooltip = wfMsg(
'bs-userbar_loginswitch_logout', 'Logout' );
+ $sLoginSwitchTooltip = wfMessage(
'bs-userbar_loginswitch_logout', 'Logout' )->plain();
$aOut[] = '<div id="bs-user-container">';
$aOut[] = '<div id="bs-button-logout">';
$aOut[] = ' <span>' . $sLoginSwitchTooltip . '</span>';
- $aOut[] = ' <a href="' .
SpecialPage::getTitleFor('UserLogout')->escapeLocalURL(array('returnto' =>
$wgRequest->getVal('title'))) . '" title="' . $sLoginSwitchTooltip . '">';
+ $aOut[] = ' <a href="' . SpecialPage::getTitleFor(
'Userlogout' )->getLocalURL( array( 'returnto' => $wgRequest->getVal( 'title' )
) ) . '" title="' . $sLoginSwitchTooltip . '">';
$aOut[] = ' <img src="' . $this->data['stylepath'] .
'/' . $this->data['stylename'] . '/resources/images/desktop/logout-icon.png"
alt="' . $sLoginSwitchTooltip . '" />';
$aOut[] = ' </a>';
$aOut[] = '</div>';
@@ -460,17 +460,19 @@
$aUserBarBeforeLogoutViews = array();
$aOut[] = '<div id="bs-button-user">';
- $aOut[] = ' <span>' . wfMsg('bs-my-account') .
'</span>';
+ $aOut[] = ' <span>' .
wfMessage('bs-my-account')->plain() . '</span>';
//$aOut[] =
$wgUser->getSkin()->link($wgUser->getUserPage(), ' <img src="' .
$this->data['stylepath'] . '/' . $this->data['stylename'] .
'/resources/images/desktop/' . $sButtonUserImage . '" alt="' .
$sUserDisplayName . '" />');
//$aOut[] =
$wgUser->getSkin()->link($wgUser->getUserPage(), '<div id="bs-button-user-img"
style="background-image:
url('.BsCore::getInstance()->getUserMiniProfile($wgUser, array("width"=>"19",
"height" => "16"))->execute().');"></div>');
$aOut[] =
BsCore::getInstance()->getUserMiniProfile($wgUser, array("width"=>"19",
"height" => "16"))->execute();
$aOut[] = ' <ul id="bs-personal-menu">';
+ $oTitle = Title::makeTitle( NS_USER, $wgUser->getName()
);
+ $sLink = BsLinkProvider::makeLink( $oTitle,
wfMessage("bs-topbar-profile")->plain() );
$aPersonalUrlsFilter = array('userpage', 'logout',
'anonlogin', 'notifications');
$sUsername = $wgUser->getRealName() == "" ?
$wgUser->getName() : $wgUser->getRealName();
$aOut[] = "<li
class='bs-top-box'><div>".$sUsername."</div></li>";
$aOut[] = '<li id="pt-profile">';
- $aOut[] =
$wgUser->getSkin()->link($wgUser->getUserPage(),
wfMessage("bs-topbar-profile")->plain());
+ $aOut[] = $sLink;
$aOut[] = '</li>';
foreach ( $this->data['personal_urls'] as $sKey =>
$aItem ) {
if ( in_array( $sKey, $aPersonalUrlsFilter ) )
continue;
@@ -502,10 +504,10 @@
$aOut[] = '</div>';
} else {
$sButtonUserImage = 'bs-icon-user-transp-50.png';
- $sLoginSwitchTooltip =
wfMsg('bs-userbar_loginswitch_login', 'Login');
+ $sLoginSwitchTooltip =
wfMessage('bs-userbar_loginswitch_login', 'Login')->plain();
$aOut[] = '<div id="bs-button-logout">';
$aOut[] = ' <span>' . $sLoginSwitchTooltip . '</span>';
- $aOut[] = ' <a href="' .
SpecialPage::getTitleFor('UserLogin')->escapeLocalURL(array('returnto' =>
$wgRequest->getVal('title'))) . '" title="' . $sLoginSwitchTooltip . '">';
+ $aOut[] = ' <a href="' . SpecialPage::getTitleFor(
'Userlogin' )->escapeLocalURL( array( 'returnto' => $wgRequest->getVal( 'title'
) ) ) . '" title="' . $sLoginSwitchTooltip . '">';
$aOut[] = ' <img src="' . $this->data['stylepath'] .
'/' . $this->data['stylename'] . '/resources/images/desktop/login-icon.png"
alt="' . $sLoginSwitchTooltip . '" />';
$aOut[] = ' </a>';
$aOut[] = '</div>';
@@ -665,15 +667,15 @@
<div id="bs-nav-sections"> <?php //
TODO RBV (02.11.10 11:36): encapsulate creation of left navigation. Maybe
views? ?>
<ul id ="bs-nav-tabs">
<li>
- <a
href="#bs-nav-section-navigation"><?php echo wfMsg('bs-tab_navigation',
'Navigation'); ?></a>
+ <a
href="#bs-nav-section-navigation"><?php echo wfMessage('bs-tab_navigation',
'Navigation')->plain(); ?></a>
</li>
<?php if ($wgUser->isLoggedIn()) { ?>
<li>
- <a
href="#bs-nav-section-focus"><?php echo wfMsg('bs-tab_focus', 'Focus'); ?></a>
+ <a
href="#bs-nav-section-focus"><?php echo wfMessage('bs-tab_focus',
'Focus')->plain(); ?></a>
</li>
<?php if
($wgUser->isAllowed('wikiadmin')) { ?>
<li>
-
<a href="#bs-nav-section-admin"><?php echo wfMsg('bs-tab_admin', 'Admin');
?></a>
+
<a href="#bs-nav-section-admin"><?php echo wfMessage('bs-tab_admin',
'Admin')->plain(); ?></a>
</li>
<?php }
}
diff --git a/includes/BlueSpiceSkinHooks.php b/includes/BlueSpiceSkinHooks.php
index 9cb7345..ce7c95b 100644
--- a/includes/BlueSpiceSkinHooks.php
+++ b/includes/BlueSpiceSkinHooks.php
@@ -127,4 +127,13 @@
$sImg = "<img src='".$sLogoPath."' alt='' />";
return true;
}
+
+ public static function onVisualEditorConfig(&$aStandardConf,
&$aDefaultConf){
+ global $wgStylePath, $wgServer;
+ if (isset($aStandardConf['content_css']) &&
$aStandardConf['content_css'] != "")
+ $aStandardConf['content_css'] .= ",";
+ //add the content.css file to this array and it will be
available in the VisualEditor (styling tables e.g.)
+ $aStandardConf['content_css'] = $wgServer . "/" . $wgStylePath
.'/BlueSpiceSkin/resources/bluespiceskin.content.css';
+ return true;
+ }
}
\ No newline at end of file
diff --git a/resources/bluespiceskin.content.css
b/resources/bluespiceskin.content.css
index af2bcca..1f03e41 100644
--- a/resources/bluespiceskin.content.css
+++ b/resources/bluespiceskin.content.css
@@ -102,6 +102,10 @@
background-color: #DEDCDC;
}
+div#mw-content-text {
+ padding-top: 25px;
+}
+
#mw-content-text p{
color:#000000;
font-family:"Open Sans", sans-serif;
@@ -319,4 +323,4 @@
padding: 0 !important;
margin: 0 !important;
content: normal !important;
-}*/
\ No newline at end of file
+}*/
diff --git a/resources/bluespiceskin.fonts.css
b/resources/bluespiceskin.fonts.css
index 621a9e9..046b3a0 100644
--- a/resources/bluespiceskin.fonts.css
+++ b/resources/bluespiceskin.fonts.css
@@ -1,3 +1,6 @@
+/*hint: http://carnage-melon.tom7.org/embed/*/
+/*transforms the ttf files to a ie-usable file*/
+
@font-face{
font-family: Source Sans Pro;
src: url("fonts/source_sans_pro_600.ttf");
diff --git a/resources/bluespiceskin.form.css b/resources/bluespiceskin.form.css
index a75c924..d41b93c 100644
--- a/resources/bluespiceskin.form.css
+++ b/resources/bluespiceskin.form.css
@@ -55,29 +55,6 @@
background:none;
}
-input#bs-search-fulltext {
- /*@embed*/
- background:url(images/desktop/search.png) no-repeat
transparent!important;
- background-position:0 0;
- height:13px;
- width:12px;
- border:0 none;
- cursor:pointer;
- float:right;
- margin:3px 3px 0;
-
-}
-
-input#bs-search-fulltext,
-input#bs-search-fulltext:hover {
- /*@embed*/
- background: none no-repeat center center!important;
- position:absolute;
- width:33px;
- height:23px;
- margin-left: 334px;
-}
-
input#wpSave,
input#wpDiff,
input#wpPreview {
diff --git a/resources/bluespiceskin.icons.css
b/resources/bluespiceskin.icons.css
new file mode 100644
index 0000000..d3f26cc
--- /dev/null
+++ b/resources/bluespiceskin.icons.css
@@ -0,0 +1,9 @@
+.icon-silk-add {
+ /*@embed*/
+ background-image: url('images/desktop/bs-add.png');
+}
+
+.icon-silk-delete {
+ /*@embed*/
+ background-image: url('images/desktop/bs-delete.png');
+}
\ No newline at end of file
diff --git a/resources/bluespiceskin.main.js b/resources/bluespiceskin.main.js
index ceaeeda..18f9695 100644
--- a/resources/bluespiceskin.main.js
+++ b/resources/bluespiceskin.main.js
@@ -49,20 +49,20 @@
initSearchBox: function() {
$('#bs-search-input').attr( 'defaultValue',
$('#bs-search-input').val() );
- if( typeof bsExtendedSearchSetFocus == "boolean" ) {
+ if ( typeof bsExtendedSearchSetFocus === "boolean" ) {
if ( wgIsArticle === true && bsExtendedSearchSetFocus
=== true ) {
- if ( window.location.hash == '' ) {
- $('#bs-search-input').val('').focus();
- }
-
- $('#bs-search-input').keypress(function() {
- if ( $(this).val() == $(this).attr(
'defaultValue' ) ) {
- $(this).val('');
- }
- });
+ if ( window.location.hash === '' ) {
+ $('#bs-search-input').val('').focus();
+ }
}
}
+ $('#bs-search-input').keypress(function() {
+ if ( $(this).val() == $(this).attr( 'defaultValue' ) )
{
+ $(this).val('');
+ }
+ });
+
$('#bs-search-input').focus(function(){
if ( $(this).val() == $(this).attr( 'defaultValue' ) )
$(this).val('');
diff --git a/resources/bluespiceskin.skin.main.css
b/resources/bluespiceskin.skin.main.css
index 94c25fb..5cb4240 100644
--- a/resources/bluespiceskin.skin.main.css
+++ b/resources/bluespiceskin.skin.main.css
@@ -262,7 +262,6 @@
overflow:hidden;
font-size:12px;
font-family:'Muli', sans-serif;
- color:#333;
padding:8px 0!important;
}
#bs-nav-section-navigation > div > ul > li{
@@ -401,6 +400,13 @@
margin:0 auto;
}
+#bs-left-resize-btn.narrowed{
+ background-image: url(images/desktop/navi-expand-btn.png);
+}
+
+#bs-left-resize-btn.extended{
+ background-image: url(images/desktop/navi-collapse-btn.png);
+}
#bs-left-resize-container {
/*@embed*/
background-color: #98a7c4;
@@ -459,6 +465,15 @@
position:absolute;
left:365px;
top:9px;
+}
+input#bs-search-fulltext {
+ /*@embed*/
+ background: url('images/desktop/search--btn.png') 8px 35px
no-repeat!important;
+ position:absolute;
+ width:33px;
+ height:28px;
+ margin-left: 334px;
+ border: 0px;
}
#bs-menu-top-right > div {
@@ -554,8 +569,8 @@
}
#bs-personal-menu-open{
display: block;
- margin: 0 0 0 -125px;
- margin-top: 0.75em;
+ margin: 8px 0 0 -125px;
+ margin-top: 10px \0/;
}
#bs-menu-top-right > #bs-user-container-open{
display: none;
@@ -566,11 +581,11 @@
color:#3E5389;
text-decoration:none;
vertical-align:middle;
- padding:5px 20px;
+ padding:5px 19px 5px 20px;
}
#bs-personal-menu-open li a{
color: white;
- margin-left: 12px;
+ margin-left: 13px;
width: 178px;
}
@@ -751,7 +766,6 @@
}
#ca-more-menu {
- padding:10px 0 15px 0;
margin: 0;
}
@@ -791,7 +805,7 @@
#ca-watch.icon a.watched, #ca-watch.icon a:hover{
/*@embed*/
- background:url(images/desktop/bs-statebar-btn-follow-on.png) no-repeat
center 8px transparent;
+ background:url(images/desktop/bs-statebar-btn-follow-on.png) no-repeat
center 7px transparent;
}
#catlinks {
@@ -1323,7 +1337,7 @@
height:90px;
text-decoration:none;
vertical-align:middle;
- width:100px;
+ width:160px;
}
.bs-admincontrolbtn a:hover {
@@ -1452,8 +1466,8 @@
text-align: center;
}
.bs-top-box div{
- width: 218px;
- margin-left: 12px;
+ width: 217px;
+ margin-left: 13px;
background-color: #9D9D9D;
}
.bs-user-label {
@@ -1946,6 +1960,17 @@
cursor:help;
}
+/* MediaWiki default from vector/screen.css, altered to use 'Source Sans Pro'
*/
+html,
+body {
+ height: 100%;
+ margin: 0;
+ padding: 0;
+ font-family: 'Source Sans Pro', sans-serif;
+ font-size: 1em;
+}
+/* END MediaWiki default */
+
body {
color:#444;
/*@embed*/
@@ -2135,10 +2160,6 @@
div.multipageimagenavbox hr {
margin:6px;
-}
-
-div.mw-content-ltr {
- padding-top:25px;
}
div.mw-lag-warn-high {
@@ -2761,4 +2782,8 @@
}
.selflink {
font-weight: normal;
+}
+
+.mw-content-ltr .editsection {
+ float: right;
}
\ No newline at end of file
diff --git a/resources/bluespiceskin.skin.main.js
b/resources/bluespiceskin.skin.main.js
index 5da17d1..f72e38f 100644
--- a/resources/bluespiceskin.skin.main.js
+++ b/resources/bluespiceskin.skin.main.js
@@ -1,86 +1,99 @@
-$(document).ready(function(){
- if ($("#bs-nav-small").length != 0 && $("#bs-left-resize-btn").length
!= 0){
+$(document).ready(function() {
+ if ($("#bs-nav-small").length != 0 && $("#bs-left-resize-btn").length
!= 0) {
$("#bs-nav-sections").append($("#bs-nav-small"));
-
- $("#bs-left-resize-btn").bind('click', function(){
- if ($('#bs-nav-small').css('display') == 'none'){
- $(this).fadeOut(300, function(){
- $(this).css('background-image', 'url(
'+wgScriptPath+'/skins/BlueSpiceSkin/resources/images/desktop/navi-expand-btn.png)').fadeIn();
+ $("#bs-left-resize-btn").bind('click', function() {
+ if ($('#bs-nav-small').css('display') == 'none') {
+ $(this).fadeOut(300, function() {
+ //$(this).css('background-image', 'url(
'+wgScriptPath+'/skins/BlueSpiceSkin/resources/images/desktop/navi-expand-btn.png)').fadeIn();
+
$(this).removeClass("extended").addClass("narrowed").fadeIn();
});
- $("#bs-nav-sections > div").each(function(i, v){
+ $("#bs-nav-sections > div").each(function(i, v)
{
if ($(v).attr('id') != 'bs-nav-small')
$(v).fadeOut();
});
- $("#bs-nav-sections > ul").fadeOut(400,
function(){
+ $("#bs-nav-sections > ul").fadeOut(400,
function() {
$("#bs-nav-small").fadeIn();
});
$("#bs-left-column").animate({width: '60px'});
- if ($("#bs-left-column").css('float') ==
'right')
- $("#bs-content-column,
#footer").animate({"margin-right": '90px'});
- else
- $("#bs-content-column,
#footer").animate({"margin-left": '90px'});
+ if ($("#bs-left-column").css('float') ==
'right')
+ $("#bs-content-column,
#footer").animate({"margin-right": '90px'});
+ else
+ $("#bs-content-column,
#footer").animate({"margin-left": '90px'});
$("#bs-tools-container").css('width',
$("#bs-tools-container").width() + 110 + "px");
- var marginleft = 0;
- if( wgUserName
!== null ) $("#bs-tools-container").css('margin-left').replace('px', '');
- var margin = +marginleft;
- $("#bs-tools-container").css('margin-left',
margin-110+"px");
+ var margin =
+$("#bs-tools-container").css('margin-left').replace('px', '');
+ $("#bs-tools-container").css('margin-left',
margin - 110 + "px");
}
- else{
- $("#bs-nav-small").fadeOut(400, function(){
+ else {
+ $("#bs-nav-small").fadeOut(400, function() {
$("#bs-nav-sections > ul").fadeIn();
- $("#bs-nav-sections >
div").each(function(i, v){
- if ($(v).attr('id') !=
'bs-nav-small')
- $(v).fadeIn();
+ $("#bs-nav-sections >
div").each(function(i, v) {
+ if ($(v).attr('id') !=
'bs-nav-small')
+ $(v).fadeIn();
});
});
- $(this).fadeOut(300, function(){
- $(this).css('background-image',
'url('+wgScriptPath+'/skins/BlueSpiceSkin/resources/images/desktop/navi-collapse-btn.png)').fadeIn();
+ $(this).fadeOut(300, function() {
+ //$(this).css('background-image',
'url('+wgScriptPath+'/skins/BlueSpiceSkin/resources/images/desktop/navi-collapse-btn.png)').fadeIn();
+
$(this).removeClass("narrowed").addClass("extended").fadeIn();
});
var new_height = 0;
- $("#bs-nav-sections > div").each(function(i, v){
+ $("#bs-nav-sections > div").each(function(i, v)
{
if ($(v).attr('id') != 'bs-nav-small')
new_height += $(v).height();
});
new_height += $("#bs-nav-sections >
ul").height();
$("#bs-left-column").animate({width: '170px'});
- if ($("#bs-left-column").css('float') ==
'right')
- $("#bs-content-column,
#footer").animate({"margin-right": '200px'});
- else
- $("#bs-content-column,
#footer").animate({"margin-left": '200px'});
+ if ($("#bs-left-column").css('float') ==
'right')
+ $("#bs-content-column,
#footer").animate({"margin-right": '200px'});
+ else
+ $("#bs-content-column,
#footer").animate({"margin-left": '200px'});
$("#bs-tools-container").css('width',
$("#bs-tools-container").width() - 110 + "px");
- var marginleft
= 0;
- if( wgUserName
!== null ) $("#bs-tools-container").css('margin-left').replace('px', '');
- var margin = +marginleft;
- $("#bs-tools-container").css('margin-left',
margin+110+"px");
+ var margin =
+$("#bs-tools-container").css('margin-left').replace('px', '');
+ $("#bs-tools-container").css('margin-left',
margin + 110 + "px");
}
});
}
- $("#bs-statebar-viewtoggler-image").attr( 'src',
wgScriptPath+'/skins/BlueSpiceSkin/resources/images/desktop/statusbar-btn_more.png');
+ $("#bs-statebar-viewtoggler-image").attr('src', wgScriptPath +
'/skins/BlueSpiceSkin/resources/images/desktop/statusbar-btn_more.png');
$("#bs-statebar-viewtoggler-image").css('display', 'block');
$("#bs-beforearticlecontent").append($("#bs-statebar-viewtoggler"));
- if (typeof BsStateBar != 'undefined'){
- BsStateBar.imagePathActive =
wgScriptPath+'/skins/BlueSpiceSkin/resources/images/desktop/statusbar-btn_less.png';
- BsStateBar.imagePathInactive =
wgScriptPath+'/skins/BlueSpiceSkin/resources/images/desktop/statusbar-btn_more.png';
+ if (typeof BsStateBar != 'undefined') {
+ BsStateBar.imagePathActive = wgScriptPath +
'/skins/BlueSpiceSkin/resources/images/desktop/statusbar-btn_less.png';
+ BsStateBar.imagePathInactive = wgScriptPath +
'/skins/BlueSpiceSkin/resources/images/desktop/statusbar-btn_more.png';
}
+ $("#bs-statebar-viewtoggler-image").toggle(function() {
+ console.log('in');
+ $(this).css('margin-top', "0 !important");
+ $(this).css('margin-right', "auto !important");
+ $(this).css('margin-bottom', "0 !important");
+ $(this).css('margin-right', "auto !important");
+ return true;
+ }, function() {
+ console.log('in2');
+ $(this).css('margin-top', "0 !important");
+ $(this).css('margin-right', "0 !important");
+ $(this).css('margin-bottom', "0 !important");
+ $(this).css('margin-right', "0 !important");
+ return true;
+ });
/*BlueSpice.Skin.initWidgets = function(){};
- BlueSpice.Skin.initMoreMenu = function(){};
- BlueSpice.Skin.initPersonalMenu = function(){};*/
- $('#bs-search-input').focus(function(e){
- if( $(this).val() == $(this).attr( 'defaultValue' ) )
$(this).val('');
+ BlueSpice.Skin.initMoreMenu = function(){};
+ BlueSpice.Skin.initPersonalMenu = function(){};*/
+ $('#bs-search-input').focus(function(e) {
+ if ($(this).val() == $(this).attr('defaultValue'))
+ $(this).val('');
e.stopPropagation();
return false;
- }).blur(function(e){
- if($(this).val() == '' || $(this).val() == $(this).attr(
'defaultValue' ) ) {
- $(this).val( $(this).attr( 'defaultValue' ) );
+ }).blur(function(e) {
+ if ($(this).val() == '' || $(this).val() ==
$(this).attr('defaultValue')) {
+ $(this).val($(this).attr('defaultValue'));
}
e.stopPropagation();
return false;
});
var height = 0;
- $("#bs-flyout-content div.bs-widget").each(function(i, v){
+ $("#bs-flyout-content div.bs-widget").each(function(i, v) {
//$("#bs-tools-widgets").append($(v));
- $(v).find("h5, li, em").each(function(i2, v2){
+ $(v).find("h5, li, em").each(function(i2, v2) {
if ($(v2).text().length > 25)
height += 55;
else
@@ -89,36 +102,38 @@
//height += $(v).height();
});
var column = 0;
- $("#bs-flyout-content div.bs-widget").each(function(i, v){
-
+ $("#bs-flyout-content div.bs-widget").each(function(i, v) {
+
$(v).find('.bs-widget-body').css('display', 'block');
- var sCookieKey = $(v).attr('id')+'-viewstate';
+ var sCookieKey = $(v).attr('id') + '-viewstate';
$.cookie(sCookieKey, null, {path: '/'});
-
$(v).find('.bs-widget-head').click(function(e){e.stopPropagation();});
- if (($("#bs-tools-widgets-column-" + column).height() +
$(v).height()) > height/4)
+ $(v).find('.bs-widget-head').click(function(e) {
+ e.stopPropagation();
+ });
+ if (($("#bs-tools-widgets-column-" + column).height() +
$(v).height()) > height / 4)
column++;
$("#bs-tools-widgets-column-" + column).append($(v));
});
var biggest = 0;
- $('.bs-tools-widgets-column').each(function(i, v){
+ $('.bs-tools-widgets-column').each(function(i, v) {
if (biggest < $(v).height())
biggest = $(v).height();
});
/*$('.bs-tools-widgets-column').each(function(i, v){
- $(v).height(biggest);
- });*/
+ $(v).height(biggest);
+ });*/
$("#bs-widget-container").detach();
$("#bs-tools-container").css('display', 'none');
$('#bs-tools').click(function() {
- if ($("#bs-tools-container").css('visibility') === 'hidden'){
+ if ($("#bs-tools-container").css('visibility') === 'hidden') {
$("#bs-tools-img").css("background-position", "0px
-18px");
if ($('#bs-tools-container').css('visibility') ==
'hidden')
$('#bs-tools-container').css('visibility',
'visible');
$('#bs-tools-container').fadeIn();
return;
}
- else{
- $('#bs-tools-container').fadeOut(function(){
+ else {
+ $('#bs-tools-container').fadeOut(function() {
$("#bs-tools-img").css("background-position",
"0px 0px");
$('#bs-tools-container').css('visibility',
'hidden');
});
@@ -128,72 +143,74 @@
$("#bs-tools-widgets").width($("#bs-beforearticlecontent").outerWidth());
$("#bs-tools-container").width($("#bs-beforearticlecontent").outerWidth() + 30);
$("#bs-tools-shadow-bottom-middle").width($("#bs-beforearticlecontent").outerWidth());
- $(".bs-tools-widgets-column").each(function(i, v){
+ $(".bs-tools-widgets-column").each(function(i, v) {
$(v).css("min-height", biggest + "px");
$(v).width($("#bs-tools-widgets").width() / 5);
});
$("#bs-tools-more").css("min-height", biggest + "px");
$("#bs-tools-more").width($("#bs-tools-widgets").width() / 5 - 5);
var elemWidth = 200;
- if ( $(".bs-tools-widgets-column").width() !== null ) {
+ if ($(".bs-tools-widgets-column").width() !== null) {
elemWidth = $(".bs-tools-widgets-column").width();
}
$(".bs-widget-head").css('width', elemWidth - 20 + "px");
$("#bs-tools-more .bs-widget-head").css('width', elemWidth - 25 + "px");
$("#bs-tools-container").css('margin-left',
(($("#bs-beforearticlecontent").outerWidth() - 46) * -1) + "px");
$("#bs-afterarticlecontent").append($('#footer-info'));
-
+
$("#mw-data-after-content >div > span").css('height', 'auto');
-
+
var user_menu = $("#bs-user-container").clone();
user_menu.attr('id', "bs-user-container-open");
- user_menu.find("div, ul, li").each(function(i, v){
+ user_menu.find("div, ul, li").each(function(i, v) {
if ($(v).attr('id') != "")
$(v).attr('id', $(v).attr('id') + "-open");
});
$("#bs-user-container").after(user_menu);
- $('#pt-notifications-open a').click(function(e){
+ $('#pt-notifications-open a').click(function(e) {
e.preventDefault();
$('#pt-notifications a').click();
});
- $("#pt-notifications-open a").text( mw.message('bs-top-bar-messages',
$("#pt-notifications-open a").text()).text());
- $('#bs-button-user, #bs-button-logout').mouseenter( function(e){
+ $("#pt-notifications-open a").text(mw.message('bs-top-bar-messages',
$("#pt-notifications-open a").text()).text());
+ $('#bs-button-user, #bs-button-logout').mouseenter(function(e) {
e.preventDefault();
$("#bs-user-container-open").fadeIn();
+ $("#pt-notifications").fadeOut();
});
- $("#bs-user-container-open").mouseleave(function(){
+ $("#bs-user-container-open").mouseleave(function() {
//$('#bs-user-container').append($('#pt-notifications'));
$("#bs-user-container-open").fadeOut();
+ $("#pt-notifications").fadeIn();
});
- var count
=$("#review-userbar-element-open").text().replace(/(\r\n|\n|\r)/gm,"").replace(/\s+/g,
'');
+ var count =
$("#review-userbar-element-open").text().replace(/(\r\n|\n|\r)/gm,
"").replace(/\s+/g, '');
var oLink = $("#review-userbar-element-open a");
oLink.html(mw.message('bs-top-bar-review', +count).text());
$("#review-userbar-element-open").html(oLink);
if ($("div.mw-badge-important").length > 0)
$("#pt-notifications").css("background-position", "0px -10px");
- if ($("#bs-afterarticlecontent div.bs-readers").length > 0){
+ if ($("#bs-afterarticlecontent div.bs-readers").length > 0) {
var authors = $("<div id='bs-authors-img-container'>");
var readers = $("<div id='bs-readers-img-container'>");
$("div.bs-authors legend").addClass("authors-legend");
$("div.bs-readers legend").addClass("readers-legend");
$("div.bs-authors legend").after($("div.bs-readers legend"));
- $("div.bs-authors div").each(function(i, v){
+ $("div.bs-authors div").each(function(i, v) {
authors.append($(v));
});
- $("div.bs-readers div").each(function(i, v){
+ $("div.bs-readers div").each(function(i, v) {
readers.append($(v));
});
$("div.bs-authors fieldset").append(authors);
$("div.bs-authors fieldset").append(readers);
$("legend.authors-legend").addClass('active');
$("div.bs-authors").addClass('tabbed');
- $("legend.readers-legend").bind('click', function(){
+ $("legend.readers-legend").bind('click', function() {
$("#bs-authors-img-container").css('display', 'none');
$("#bs-readers-img-container").css('display', 'block');
$(this).addClass('active');
$("legend.authors-legend").removeClass('active');
});
- $("legend.authors-legend").bind('click', function(){
+ $("legend.authors-legend").bind('click', function() {
$("#bs-readers-img-container").css('display', 'none');
$("#bs-authors-img-container").css('display', 'block');
$(this).addClass('active');
@@ -201,16 +218,16 @@
});
$("div.bs-readers").css('display', 'none');
}
- $("#ca-more-top").hover(function(){
+ $("#ca-more-top").hover(function() {
$("#p-cactions-list-more").css('display', 'block');
- }, function(){
+ }, function() {
$("#p-cactions-list-more").css('display', 'none');
});
- $(document).ajaxSuccess(function(event, XMLHttpRequest, ajaxOptions){
- if (typeof(ajaxOptions.data) === "undefined" ||
ajaxOptions.data === null || ajaxOptions.data.indexOf("watch") === -1)
+ $(document).ajaxSuccess(function(event, XMLHttpRequest, ajaxOptions) {
+ if (typeof (ajaxOptions.data) === "undefined" ||
ajaxOptions.data === null || ajaxOptions.data.indexOf("watch") === -1)
return;
var response = $.parseJSON(XMLHttpRequest.responseText);
- if (typeof(response.watch.watched) !== "undefined")
+ if (typeof (response.watch.watched) !== "undefined")
$("#ca-watch a").addClass("watched");
else
$("#ca-watch a").removeClass("watched");
diff --git a/resources/fonts/muli_300.ttf b/resources/fonts/muli_300.ttf
index 8dfff09..1b0fed7 100644
--- a/resources/fonts/muli_300.ttf
+++ b/resources/fonts/muli_300.ttf
Binary files differ
diff --git a/resources/fonts/muli_regular.ttf b/resources/fonts/muli_regular.ttf
index cf324e4..8350ebd 100644
--- a/resources/fonts/muli_regular.ttf
+++ b/resources/fonts/muli_regular.ttf
Binary files differ
diff --git a/resources/fonts/open_sans_300.ttf
b/resources/fonts/open_sans_300.ttf
index 0d38189..0746488 100644
--- a/resources/fonts/open_sans_300.ttf
+++ b/resources/fonts/open_sans_300.ttf
Binary files differ
diff --git a/resources/fonts/open_sans_300italic.ttf
b/resources/fonts/open_sans_300italic.ttf
index 68299c4..5634deb 100644
--- a/resources/fonts/open_sans_300italic.ttf
+++ b/resources/fonts/open_sans_300italic.ttf
Binary files differ
diff --git a/resources/fonts/open_sans_600.ttf
b/resources/fonts/open_sans_600.ttf
index 1a7679e..09f764d 100644
--- a/resources/fonts/open_sans_600.ttf
+++ b/resources/fonts/open_sans_600.ttf
Binary files differ
diff --git a/resources/fonts/open_sans_600italic.ttf
b/resources/fonts/open_sans_600italic.ttf
index 59b6d16..7c83dca 100644
--- a/resources/fonts/open_sans_600italic.ttf
+++ b/resources/fonts/open_sans_600italic.ttf
Binary files differ
diff --git a/resources/fonts/open_sans_700.ttf
b/resources/fonts/open_sans_700.ttf
index fd79d43..d933a59 100644
--- a/resources/fonts/open_sans_700.ttf
+++ b/resources/fonts/open_sans_700.ttf
Binary files differ
diff --git a/resources/fonts/open_sans_700italic.ttf
b/resources/fonts/open_sans_700italic.ttf
index 9bc8009..c973765 100644
--- a/resources/fonts/open_sans_700italic.ttf
+++ b/resources/fonts/open_sans_700italic.ttf
Binary files differ
diff --git a/resources/fonts/open_sans_800.ttf
b/resources/fonts/open_sans_800.ttf
index 21f6f84..ce246f2 100644
--- a/resources/fonts/open_sans_800.ttf
+++ b/resources/fonts/open_sans_800.ttf
Binary files differ
diff --git a/resources/fonts/open_sans_800italic.ttf
b/resources/fonts/open_sans_800italic.ttf
index 31cb688..54626c5 100644
--- a/resources/fonts/open_sans_800italic.ttf
+++ b/resources/fonts/open_sans_800italic.ttf
Binary files differ
diff --git a/resources/fonts/open_sans_condensed 300.ttf
b/resources/fonts/open_sans_condensed 300.ttf
index 97c355b..c65a257 100644
--- a/resources/fonts/open_sans_condensed 300.ttf
+++ b/resources/fonts/open_sans_condensed 300.ttf
Binary files differ
diff --git a/resources/fonts/open_sans_condensed 300italic.ttf
b/resources/fonts/open_sans_condensed 300italic.ttf
index 0b45898..2e32c5c 100644
--- a/resources/fonts/open_sans_condensed 300italic.ttf
+++ b/resources/fonts/open_sans_condensed 300italic.ttf
Binary files differ
diff --git a/resources/fonts/open_sans_condensed 700.ttf
b/resources/fonts/open_sans_condensed 700.ttf
index 83966f2..8d9ec8a 100644
--- a/resources/fonts/open_sans_condensed 700.ttf
+++ b/resources/fonts/open_sans_condensed 700.ttf
Binary files differ
diff --git a/resources/fonts/open_sans_italic.ttf
b/resources/fonts/open_sans_italic.ttf
index c90da48..d844484 100644
--- a/resources/fonts/open_sans_italic.ttf
+++ b/resources/fonts/open_sans_italic.ttf
Binary files differ
diff --git a/resources/fonts/open_sans_regular.ttf
b/resources/fonts/open_sans_regular.ttf
index db43334..face4ab 100644
--- a/resources/fonts/open_sans_regular.ttf
+++ b/resources/fonts/open_sans_regular.ttf
Binary files differ
diff --git a/resources/fonts/raleway_300.ttf b/resources/fonts/raleway_300.ttf
index 8b1d260..42471d8 100644
--- a/resources/fonts/raleway_300.ttf
+++ b/resources/fonts/raleway_300.ttf
Binary files differ
diff --git a/resources/fonts/raleway_500.ttf b/resources/fonts/raleway_500.ttf
index 127cdaa..9245a03 100644
--- a/resources/fonts/raleway_500.ttf
+++ b/resources/fonts/raleway_500.ttf
Binary files differ
diff --git a/resources/fonts/source_sans_pro_300.ttf
b/resources/fonts/source_sans_pro_300.ttf
index 5094f90..c6a8f84 100644
--- a/resources/fonts/source_sans_pro_300.ttf
+++ b/resources/fonts/source_sans_pro_300.ttf
Binary files differ
diff --git a/resources/fonts/source_sans_pro_600.ttf
b/resources/fonts/source_sans_pro_600.ttf
index 96be817..ef803d5 100644
--- a/resources/fonts/source_sans_pro_600.ttf
+++ b/resources/fonts/source_sans_pro_600.ttf
Binary files differ
diff --git a/resources/images/desktop/bs-add.png
b/resources/images/desktop/bs-add.png
new file mode 100644
index 0000000..6332fef
--- /dev/null
+++ b/resources/images/desktop/bs-add.png
Binary files differ
diff --git a/resources/images/desktop/bs-delete.png
b/resources/images/desktop/bs-delete.png
new file mode 100644
index 0000000..08f2493
--- /dev/null
+++ b/resources/images/desktop/bs-delete.png
Binary files differ
--
To view, visit https://gerrit.wikimedia.org/r/102946
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9122abe2c912d59feeef6a15a7373981ac7c64de
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Pigpen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
