Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Minor fixes for second sister search AB test"

Browse source
This commit is contained in:
jenkins-bot 2017-03-14 16:12:38 +00:00 committed by Gerrit Code Review
commit 24e421e2a2
4 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/widget/search/InterwikiSearchResultSetWidget.php
View file

@ -161,7 +161,7 @@ class InterwikiSearchResultSetWidget implements SearchResultSetWidget {
$searchLink = Html::rawElement(
'a',
[ 'href' => $href ],
$this->specialSearch->msg( 'search-interwiki-more' )->escaped()
$this->specialSearch->msg( 'search-interwiki-more-results' )->escaped()
);
return Html::rawElement( 'div', [ 'class' => 'iw-result__footer' ], $searchLink );

2
resources/Resources.php
View file

@ -2015,7 +2015,7 @@ return [
],
'targets' => [ 'desktop', 'mobile' ],
'messages' => [
'search-interwiki-more',
'search-interwiki-more-results',
'searchprofile-images'
],
],

6
resources/src/mediawiki.special/mediawiki.special.search.commonsInterwikiWidget.js
View file

@ -3,7 +3,7 @@
var api = new mw.Api(),
pageUrl = new mw.Uri(),
imagesText = new mw.Message( mw.messages, 'searchprofile-images' ),
moreResultsText = new mw.Message( mw.messages, 'search-interwiki-more' );
moreResultsText = new mw.Message( mw.messages, 'search-interwiki-more-results' );
function itemTemplate( results ) {
@ -28,7 +28,7 @@
function itemWrapperTemplate( pageQuery, itemTemplateOutput ) {
return '<li class="iw-resultset iw-resultset--image" data-iw-resultsset-pos="0">' +
return '<li class="iw-resultset iw-resultset--image" data-iw-resultset-pos="0">' +
'<div class="iw-result__header">' +
'<span class="iw-result__icon iw-result__icon--image"></span>' +
'<strong>' + imagesText.escaped() + '</strong>' +
@ -67,7 +67,7 @@
}
results.sort( function( a, b ) {
return b.index - a.index;
return a.index - b.index;
} );
multimediaWidgetTemplate = itemWrapperTemplate( pageUrl.query.search, itemTemplate( results ) );

19
resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less
View file

@ -2,8 +2,13 @@
/*==========================*/
#mw-interwiki-results {
float: right;
width: 30%;
display: inline-block;
margin-left: 10%;
}
.searchresults .mw-search-createlink {
float: left;
}
.iw-headline {
@ -76,7 +81,6 @@ to resemble a traditional dictionary definition */
}
.iw-result__title a.extiw {
color: #252525;
font-weight: bold;
}
@ -203,24 +207,17 @@ span the interwiki results across the bottom of the page.
@media only screen and ( max-width: 768px ) {
#mw-interwiki-results {
width: 100%;
margin-left: 0;
}
.mw-search-results {
max-width: none !important;
}
.iw-resultset {
width: 45% !important;
margin-left: 0.5em !important;
margin-right: 0.5em !important;
}
}
@media only screen and ( max-width: 600px ) {
.iw-resultset {
width: 100% !important;
margin-left: 0 !important;
margin-right: 0 !important;
max-width: none !important;
}
}
/* stylelint-enable declaration-no-important */